diff --git a/Docker/Dockerfile/dockerfile b/Docker/Dockerfile/dockerfile index 38aa3f8..52a0104 100644 --- a/Docker/Dockerfile/dockerfile +++ b/Docker/Dockerfile/dockerfile @@ -1,4 +1,4 @@ -from python:3.7 +from python:3.8-bullseye ## UPDATE RUN apt-get update @@ -9,16 +9,16 @@ RUN pip install pip --upgrade ## PYTHON RUN pip install django==2.2 -RUN pip install djangorestframework==3.11 -RUN pip install requests +RUN pip install django-admin-sortable2==1.0.2 +RUN pip install djangorestframework RUN pip install django-jet +RUN pip install requests RUN pip install gunicorn RUN pip install django-admin-rangefilter RUN pip install sentry-sdk RUN pip install python-dateutil RUN pip install Werkzeug RUN pip install django-solo -RUN pip install django-admin-sortable2 RUN pip install admin-totals RUN pip install django-tenants RUN pip install mollie-api-python diff --git a/Docker/compose/docker-compose-base.yml b/Docker/compose/docker-compose-base.yml index 67b1d4b..153a33a 100644 --- a/Docker/compose/docker-compose-base.yml +++ b/Docker/compose/docker-compose-base.yml @@ -20,8 +20,8 @@ services: billetterie_django: container_name: billetterie_django -# build: ../Dockerfile/ - image: registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s + build: ../Dockerfile/ +# image: registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s restart: always # ports: # - 8002:8002 @@ -34,8 +34,8 @@ services: billetterie_celery: container_name: billetterie_celery -# build: ../Dockerfile/ - image: registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s + build: ../Dockerfile/ +# image: registry.3peaks.re/billetterie_django:2.8-bullyeses_python38_prelog4s restart: always volumes: - "../../DjangoFiles:/DjangoFiles" @@ -44,6 +44,7 @@ services: # command: "bash /DjangoFiles/launch.sh" + billetterie_nginx: container_name: billetterie_nginx image: nginx