diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | docker/nging/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/pysite.dockerapp (renamed from pysite.dockerapp) | 0 |
3 files changed, 25 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb5363c9..78b6eda9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,11 +108,19 @@ push-django: image: docker:stable-git stage: deploy script: - - docker build -t pythondiscord/django:latest . - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin + - docker build -t pythondiscord/django:latest . - docker push pythondiscord/django:latest only: - master - django tags: - docker + +push-nging: + image: docker:stable-git + stage: deploy + script: + - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin + - docker build -t pythondiscord/nging:latest . + - docker push pythondiscord/nging:latest diff --git a/docker/nging/Dockerfile b/docker/nging/Dockerfile new file mode 100644 index 00000000..4d32af6c --- /dev/null +++ b/docker/nging/Dockerfile @@ -0,0 +1,16 @@ +FROM pythondiscord/django AS builder + +ENV DATABASE_URL postgres://user:pass@host/db +ENV SECRET_KEY unused + +RUN mkdir -p /var/www/pythondiscord.com + +RUN python3 manage.py collectstatic --noinput + + +## NGINX setup +# Copy over only the static files from the previous stage +# to ensure a minimal image size in our NGINX container. +FROM nginx:alpine + +COPY --from=builder /var/www/pythondiscord.com /var/www/pythondiscord.com diff --git a/pysite.dockerapp b/docker/pysite.dockerapp index 4a811861..4a811861 100644 --- a/pysite.dockerapp +++ b/docker/pysite.dockerapp |