diff --git a/.env.example b/.env.example index 9e0b732a..72978921 100644 --- a/.env.example +++ b/.env.example @@ -35,7 +35,6 @@ RUN_COLLECT_STATIC=True RUN_SEED_GROUPS=True RUN_SEED_LOCATIONS=True RUN_CREATE_SUPER_USER=True -RUN_CREATE_ADMIN=True # database # change DATABASE_ENGINE to "mysql" if you want to use MySQL or "psql" for PostgreSQL diff --git a/docker/dockerfiles/Dockerfile b/docker/dockerfiles/Dockerfile index 7642f6e9..c5a3ecaf 100644 --- a/docker/dockerfiles/Dockerfile +++ b/docker/dockerfiles/Dockerfile @@ -27,7 +27,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - gettext && \ + gettext && \ python3 -m pip install --upgrade pip setuptools cython # Python virtualenv paths @@ -52,7 +52,7 @@ ENV LOG_LEVEL=INFO ENV RUN_MIGRATIONS=True ENV RUN_COMPILE_MESSAGES=True ENV RUN_COLLECT_STATIC=True -ENV RUN_CREATE_ADMIN=True +ENV RUN_CREATE_SUPER_USER=True ENV RUN_SEED_GROUPS=True # ENV ENABLE_DJANGO_ADMIN=False @@ -64,7 +64,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - nginx gcc xz-utils gettext + nginx gcc xz-utils gettext # configure process manager ARG S6_OVERLAY_VERSION=3.1.2.1 diff --git a/docker/dockerfiles/Dockerfile.dev b/docker/dockerfiles/Dockerfile.dev index 8575ef16..3b045920 100644 --- a/docker/dockerfiles/Dockerfile.dev +++ b/docker/dockerfiles/Dockerfile.dev @@ -9,7 +9,6 @@ ENV RUN_MIGRATIONS=True ENV RUN_COMPILE_MESSAGES=True ENV RUN_COLLECT_STATIC=False ENV RUN_CREATE_SUPER_USER=True -ENV RUN_CREATE_ADMIN=True ENV RUN_SEED_GROUPS=True ENV IS_CONTAINERIZED=True @@ -20,7 +19,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - nginx gcc xz-utils gettext python3 python3-pip python3-venv python3-dev git postgresql-client libpq-dev && \ + nginx gcc xz-utils gettext python3 python3-pip python3-venv python3-dev git postgresql-client libpq-dev && \ apt-get clean diff --git a/docker/s6-rc.d/init/init.sh b/docker/s6-rc.d/init/init.sh index 9870615d..4ed200ca 100755 --- a/docker/s6-rc.d/init/init.sh +++ b/docker/s6-rc.d/init/init.sh @@ -15,7 +15,6 @@ is_enabled() { return 1 } - cd "${BACKEND_ROOT:-/var/www/redirect/backend}" || exit 1 echo "Waiting for the database to be ready"