diff options
| author |  scragly <[email protected]> | 2019-09-21 10:58:58 +1000 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-09-21 10:58:58 +1000 |
| commit | fe4ed574d5722e0504f2d7fd16af4f23159cb3a7 (patch) | |
| tree | 7d08a9dc21ee95c41c89f7ee1db429f1dacb3ee4 | |
| parent | Use explicit buildContext in CI Docker stage. (#253) (diff) | |
| parent | Merge branch 'master' into docker-fix (diff) | |
Revert uwsgi back to pip install. (#254)
Revert uwsgi back to pip install.
Diffstat (limited to '')
| -rw-r--r-- | docker/app/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/app/local.Dockerfile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 15b1f77b..67b3ef69 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -11,7 +11,7 @@ ENV PIP_NO_CACHE_DIR=false \ RUN useradd --system --shell /bin/false --uid 1500 pysite # Install prerequisites needed to complete the dependency installation. -RUN install_packages git uwsgi +RUN install_packages git gcc libc-dev libpq-dev # Copy the project files into the working directory. WORKDIR /app @@ -19,7 +19,8 @@ COPY . . # Update setuptools by removing egg first, add other dependencies RUN rm -r /opt/bitnami/python/lib/python3.*/site-packages/setuptools* && \ - pip install --no-cache-dir -U setuptools pipenv + pip install -U setuptools +RUN pip install pipenv uwsgi RUN pipenv install --system --deploy # Migrate, collect and start the app. diff --git a/docker/app/local.Dockerfile b/docker/app/local.Dockerfile index 124dab95..2c95cea3 100644 --- a/docker/app/local.Dockerfile +++ b/docker/app/local.Dockerfile @@ -10,7 +10,7 @@ ENV PIP_NO_CACHE_DIR=false \ RUN useradd --system --shell /bin/false --uid 1500 pysite # Install prerequisites needed to complete the dependency installation. -RUN install_packages git uwsgi +RUN install_packages git gcc libc-dev libpq-dev # Copy the project files into the working directory. WORKDIR /app @@ -18,7 +18,8 @@ COPY . . # Update setuptools by removing egg first, add other dependencies RUN rm -r /opt/bitnami/python/lib/python3.*/site-packages/setuptools* && \ - pip install --no-cache-dir -U setuptools pipenv + pip install -U setuptools +RUN pip install pipenv uwsgi RUN pipenv install --system --deploy RUN SECRET_KEY=placeholder DATABASE_URL=sqlite:// python3 manage.py collectstatic --no-input --clear --verbosity 0 |