mitri4
/
dokumentor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some refactor for docker image

Browse Source
prod
Dmitriy Shesterkin 9 years ago
parent 3e48313715
commit fd76b3d8c0
2 changed files with 16 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Dockerfile
  2. 26
      Makefile

4
Dockerfile
Unescape View File

@ -22,6 +22,8 @@ RUN apk update && apk add --update --no-cache --progress \
openssl \ openssl \
ca-certificates \ ca-certificates \
python3 \ python3 \
libxml2-dev \
libxslt-dev \
libmagic \ libmagic \
ghostscript \ ghostscript \
postgresql-dev \ postgresql-dev \
@ -39,7 +41,7 @@ RUN apk update && apk add --update --no-cache --progress \
pcre-dev \ pcre-dev \
zlib-dev jpeg-dev libpng-dev freetype-dev \ zlib-dev jpeg-dev libpng-dev freetype-dev \
tiff-dev lcms2-dev libwebp-dev tcl-dev tk-dev \ tiff-dev lcms2-dev libwebp-dev tcl-dev tk-dev \
libxml2-dev libxslt-dev libffi-dev \ libffi-dev \
python3-dev \ python3-dev \
&& python3 -m ensurepip \ && python3 -m ensurepip \

26
Makefile
Unescape View File

@ -25,31 +25,31 @@ requirements-local:
# target: loaddata - Load fixtures # target: loaddata - Load fixtures
loaddata: loaddata:
python manage.py loaddata src/myauth/fixtures/myauth.json python3 manage.py loaddata src/myauth/fixtures/myauth.json
python manage.py loaddata src/commons/fixtures/cms.json python3 manage.py loaddata src/commons/fixtures/cms.json
python manage.py loaddata src/commons/fixtures/djangocms_text_ckeditor.json python3 manage.py loaddata src/commons/fixtures/djangocms_text_ckeditor.json
python manage.py loaddata src/commons/fixtures/sites.json python3 manage.py loaddata src/commons/fixtures/sites.json
python manage.py loaddata src/customer/fixtures/price.json python3 manage.py loaddata src/customer/fixtures/price.json
python manage.py loaddata src/docs/fixtures/country.json python3 manage.py loaddata src/docs/fixtures/country.json
python manage.py loaddata src/docs/fixtures/currency.json python3 manage.py loaddata src/docs/fixtures/currency.json
python manage.py loaddata src/docs/fixtures/measure.json python3 manage.py loaddata src/docs/fixtures/measure.json
# target: run - Runserver # target: run - Runserver
run: run:
python manage.py runserver 0.0.0.0:8000 python3 manage.py runserver 0.0.0.0:8000
# target: migrate - Build all docker containers, defined in docker-compose.stage.yml # target: migrate - Build all docker containers, defined in docker-compose.stage.yml
migrate: migrate:
python manage.py migrate myauth --noinput python3 manage.py migrate myauth --noinput
python manage.py migrate --noinput python3 manage.py migrate --noinput
# target: shell - Run python shell # target: shell - Run python shell
shell: shell:
python manage.py shell python3 manage.py shell
# target: collectstatic - Run collectstatic # target: collectstatic - Run collectstatic
collectstatic: collectstatic:
python manage.py collectstatic --noinput python3 manage.py collectstatic --noinput
clean_temp: clean_temp:

Write Preview
Loading…
Cancel
Save