diff --git a/Dockerfile b/Dockerfile index eb130bb..ca1140f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,8 @@ RUN apk update && apk add --update --no-cache --progress \ openssl \ ca-certificates \ python3 \ + libxml2-dev \ + libxslt-dev \ libmagic \ ghostscript \ postgresql-dev \ @@ -39,7 +41,7 @@ RUN apk update && apk add --update --no-cache --progress \ pcre-dev \ zlib-dev jpeg-dev libpng-dev freetype-dev \ tiff-dev lcms2-dev libwebp-dev tcl-dev tk-dev \ - libxml2-dev libxslt-dev libffi-dev \ + libffi-dev \ python3-dev \ && python3 -m ensurepip \ diff --git a/Makefile b/Makefile index d2c2342..cc5d4df 100644 --- a/Makefile +++ b/Makefile @@ -25,31 +25,31 @@ requirements-local: # target: loaddata - Load fixtures loaddata: - python manage.py loaddata src/myauth/fixtures/myauth.json - python manage.py loaddata src/commons/fixtures/cms.json - python manage.py loaddata src/commons/fixtures/djangocms_text_ckeditor.json - python manage.py loaddata src/commons/fixtures/sites.json - python manage.py loaddata src/customer/fixtures/price.json - python manage.py loaddata src/docs/fixtures/country.json - python manage.py loaddata src/docs/fixtures/currency.json - python manage.py loaddata src/docs/fixtures/measure.json + python3 manage.py loaddata src/myauth/fixtures/myauth.json + python3 manage.py loaddata src/commons/fixtures/cms.json + python3 manage.py loaddata src/commons/fixtures/djangocms_text_ckeditor.json + python3 manage.py loaddata src/commons/fixtures/sites.json + python3 manage.py loaddata src/customer/fixtures/price.json + python3 manage.py loaddata src/docs/fixtures/country.json + python3 manage.py loaddata src/docs/fixtures/currency.json + python3 manage.py loaddata src/docs/fixtures/measure.json # target: run - Runserver 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 migrate: - python manage.py migrate myauth --noinput - python manage.py migrate --noinput + python3 manage.py migrate myauth --noinput + python3 manage.py migrate --noinput # target: shell - Run python shell shell: - python manage.py shell + python3 manage.py shell # target: collectstatic - Run collectstatic collectstatic: - python manage.py collectstatic --noinput + python3 manage.py collectstatic --noinput clean_temp: