From 49ff0de8523e188606519288759da38396ba1aa1 Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 23 Jul 2019 07:31:46 -0500 Subject: [PATCH] Refactored and pruned the docker compose files --- .../production/django => }/Dockerfile | 0 .../production/django => bin}/entrypoint | 0 .../beat/start => bin/start-celery-beat} | 0 .../worker/start => bin/start-celery-worker} | 0 .../django/start => bin/start-django} | 0 .../django/start => bin/start-django-dev} | 0 .../celery/flower/start => bin/start-flower} | 0 .../compose/local/django/Dockerfile | 44 --------------- .../compose/local/django/celery/beat/start | 8 --- .../compose/local/django/celery/worker/start | 7 --- .../compose/local/node/Dockerfile | 9 --- .../compose/production/aws/Dockerfile | 9 --- .../production/aws/maintenance/download | 24 -------- .../compose/production/aws/maintenance/upload | 30 ---------- .../production/django/celery/flower/start | 10 ---- .../compose/production/postgres/Dockerfile | 6 -- .../maintenance/_sourced/constants.sh | 5 -- .../maintenance/_sourced/countdown.sh | 12 ---- .../postgres/maintenance/_sourced/messages.sh | 41 -------------- .../postgres/maintenance/_sourced/yes_no.sh | 16 ------ .../production/postgres/maintenance/backup | 38 ------------- .../production/postgres/maintenance/backups | 22 -------- .../production/postgres/maintenance/restore | 55 ------------------- .../compose/production/traefik/Dockerfile | 5 -- .../compose/production/traefik/traefik.toml | 41 -------------- 25 files changed, 382 deletions(-) rename {{cookiecutter.project_slug}}/{compose/production/django => }/Dockerfile (100%) rename {{cookiecutter.project_slug}}/{compose/production/django => bin}/entrypoint (100%) rename {{cookiecutter.project_slug}}/{compose/production/django/celery/beat/start => bin/start-celery-beat} (100%) rename {{cookiecutter.project_slug}}/{compose/production/django/celery/worker/start => bin/start-celery-worker} (100%) rename {{cookiecutter.project_slug}}/{compose/production/django/start => bin/start-django} (100%) rename {{cookiecutter.project_slug}}/{compose/local/django/start => bin/start-django-dev} (100%) rename {{cookiecutter.project_slug}}/{compose/local/django/celery/flower/start => bin/start-flower} (100%) delete mode 100644 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile delete mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/beat/start delete mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/worker/start delete mode 100644 {{cookiecutter.project_slug}}/compose/local/node/Dockerfile delete mode 100644 {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile delete mode 100644 {{cookiecutter.project_slug}}/compose/production/aws/maintenance/download delete mode 100644 {{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload delete mode 100644 {{cookiecutter.project_slug}}/compose/production/django/celery/flower/start delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/constants.sh delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/countdown.sh delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/messages.sh delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/yes_no.sh delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backups delete mode 100644 {{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore delete mode 100644 {{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile delete mode 100644 {{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/Dockerfile similarity index 100% rename from {{cookiecutter.project_slug}}/compose/production/django/Dockerfile rename to {{cookiecutter.project_slug}}/Dockerfile diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/bin/entrypoint similarity index 100% rename from {{cookiecutter.project_slug}}/compose/production/django/entrypoint rename to {{cookiecutter.project_slug}}/bin/entrypoint diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/bin/start-celery-beat similarity index 100% rename from {{cookiecutter.project_slug}}/compose/production/django/celery/beat/start rename to {{cookiecutter.project_slug}}/bin/start-celery-beat diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start b/{{cookiecutter.project_slug}}/bin/start-celery-worker similarity index 100% rename from {{cookiecutter.project_slug}}/compose/production/django/celery/worker/start rename to {{cookiecutter.project_slug}}/bin/start-celery-worker diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/bin/start-django similarity index 100% rename from {{cookiecutter.project_slug}}/compose/production/django/start rename to {{cookiecutter.project_slug}}/bin/start-django diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/bin/start-django-dev similarity index 100% rename from {{cookiecutter.project_slug}}/compose/local/django/start rename to {{cookiecutter.project_slug}}/bin/start-django-dev diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/bin/start-flower similarity index 100% rename from {{cookiecutter.project_slug}}/compose/local/django/celery/flower/start rename to {{cookiecutter.project_slug}}/bin/start-flower diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile deleted file mode 100644 index 679378223..000000000 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM python:3.6-alpine - -ENV PYTHONUNBUFFERED 1 - -RUN apk update \ - # psycopg2 dependencies - && apk add --virtual build-deps gcc python3-dev musl-dev \ - && apk add postgresql-dev \ - # Pillow dependencies - && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \ - # CFFI dependencies - && apk add libffi-dev py-cffi \ - # Translations dependencies - && apk add gettext \ - # https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell - && apk add postgresql-client - -# Requirements are installed here to ensure they will be cached. -COPY ./requirements /requirements -RUN pip install -r /requirements/local.txt - -COPY ./compose/production/django/entrypoint /entrypoint -RUN sed -i 's/\r$//g' /entrypoint -RUN chmod +x /entrypoint - -COPY ./compose/local/django/start /start -RUN sed -i 's/\r$//g' /start -RUN chmod +x /start -{% if cookiecutter.use_celery == "y" %} -COPY ./compose/local/django/celery/worker/start /start-celeryworker -RUN sed -i 's/\r$//g' /start-celeryworker -RUN chmod +x /start-celeryworker - -COPY ./compose/local/django/celery/beat/start /start-celerybeat -RUN sed -i 's/\r$//g' /start-celerybeat -RUN chmod +x /start-celerybeat - -COPY ./compose/local/django/celery/flower/start /start-flower -RUN sed -i 's/\r$//g' /start-flower -RUN chmod +x /start-flower -{% endif %} -WORKDIR /app - -ENTRYPOINT ["/entrypoint"] diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start deleted file mode 100644 index 389e2baf1..000000000 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -o errexit -set -o nounset - - -rm -f './celerybeat.pid' -celery -A config.celery_app beat -l INFO diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start deleted file mode 100644 index 072c6ae62..000000000 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -o errexit -set -o nounset - - -celery -A config.celery_app worker -l INFO diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile deleted file mode 100644 index f9976e206..000000000 --- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM node:10-stretch-slim - -WORKDIR /app - -COPY ./package.json /app - -RUN npm install && npm cache clean --force - -ENV PATH ./node_modules/.bin/:$PATH diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile deleted file mode 100644 index 8282047b3..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM garland/aws-cli-docker:1.15.47 - -COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance -COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced - -RUN chmod +x /usr/local/bin/maintenance/* - -RUN mv /usr/local/bin/maintenance/* /usr/local/bin \ - && rmdir /usr/local/bin/maintenance diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download deleted file mode 100644 index 8d5ea091f..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -### Download a file from your Amazon S3 bucket to the postgres /backups folder -### -### Usage: -### $ docker-compose -f production.yml run --rm awscli <1> - -set -o errexit -set -o pipefail -set -o nounset - -working_dir="$(dirname ${0})" -source "${working_dir}/_sourced/constants.sh" -source "${working_dir}/_sourced/messages.sh" - -export AWS_ACCESS_KEY_ID="${DJANGO_AWS_ACCESS_KEY_ID}" -export AWS_SECRET_ACCESS_KEY="${DJANGO_AWS_SECRET_ACCESS_KEY}" -export AWS_STORAGE_BUCKET_NAME="${DJANGO_AWS_STORAGE_BUCKET_NAME}" - - -aws s3 cp s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH}/${1} ${BACKUP_DIR_PATH}/${1} - -message_success "Finished downloading ${1}." - diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload deleted file mode 100644 index 4a89dcb5a..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -### Upload the /backups folder to Amazon S3 -### -### Usage: -### $ docker-compose -f production.yml run --rm awscli upload - -set -o errexit -set -o pipefail -set -o nounset - -working_dir="$(dirname ${0})" -source "${working_dir}/_sourced/constants.sh" -source "${working_dir}/_sourced/messages.sh" - -export AWS_ACCESS_KEY_ID="${DJANGO_AWS_ACCESS_KEY_ID}" -export AWS_SECRET_ACCESS_KEY="${DJANGO_AWS_SECRET_ACCESS_KEY}" -export AWS_STORAGE_BUCKET_NAME="${DJANGO_AWS_STORAGE_BUCKET_NAME}" - - -message_info "Upload the backups directory to S3 bucket {$AWS_STORAGE_BUCKET_NAME}" - -aws s3 cp ${BACKUP_DIR_PATH} s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH} --recursive - -message_info "Cleaning the directory ${BACKUP_DIR_PATH}" - -rm -rf ${BACKUP_DIR_PATH}/* - -message_success "Finished uploading and cleaning." - diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start deleted file mode 100644 index be67050da..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -o errexit -set -o nounset - - -celery flower \ - --app=config.celery_app \ - --broker="${CELERY_BROKER_URL}" \ - --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile deleted file mode 100644 index 49dc66d6c..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM postgres:11-alpine - -COPY ./compose/production/postgres/maintenance /usr/local/bin/maintenance -RUN chmod +x /usr/local/bin/maintenance/* -RUN mv /usr/local/bin/maintenance/* /usr/local/bin \ - && rmdir /usr/local/bin/maintenance diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/constants.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/constants.sh deleted file mode 100644 index 6ca4f0ca9..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/constants.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - - -BACKUP_DIR_PATH='/backups' -BACKUP_FILE_PREFIX='backup' diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/countdown.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/countdown.sh deleted file mode 100644 index e6cbfb6ff..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/countdown.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - - -countdown() { - declare desc="A simple countdown. Source: https://superuser.com/a/611582" - local seconds="${1}" - local d=$(($(date +%s) + "${seconds}")) - while [ "$d" -ge `date +%s` ]; do - echo -ne "$(date -u --date @$(($d - `date +%s`)) +%H:%M:%S)\r"; - sleep 0.1 - done -} diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/messages.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/messages.sh deleted file mode 100644 index f6be756e9..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/messages.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - - -message_newline() { - echo -} - -message_debug() -{ - echo -e "DEBUG: ${@}" -} - -message_welcome() -{ - echo -e "\e[1m${@}\e[0m" -} - -message_warning() -{ - echo -e "\e[33mWARNING\e[0m: ${@}" -} - -message_error() -{ - echo -e "\e[31mERROR\e[0m: ${@}" -} - -message_info() -{ - echo -e "\e[37mINFO\e[0m: ${@}" -} - -message_suggestion() -{ - echo -e "\e[33mSUGGESTION\e[0m: ${@}" -} - -message_success() -{ - echo -e "\e[32mSUCCESS\e[0m: ${@}" -} diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/yes_no.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/yes_no.sh deleted file mode 100644 index fd9cae161..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/_sourced/yes_no.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - - -yes_no() { - declare desc="Prompt for confirmation. \$\"\{1\}\": confirmation message." - local arg1="${1}" - - local response= - read -r -p "${arg1} (y/[n])? " response - if [[ "${response}" =~ ^[Yy]$ ]] - then - exit 0 - else - exit 1 - fi -} diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup deleted file mode 100644 index ee0c9d63c..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - - -### Create a database backup. -### -### Usage: -### $ docker-compose -f .yml (exec |run --rm) postgres backup - - -set -o errexit -set -o pipefail -set -o nounset - - -working_dir="$(dirname ${0})" -source "${working_dir}/_sourced/constants.sh" -source "${working_dir}/_sourced/messages.sh" - - -message_welcome "Backing up the '${POSTGRES_DB}' database..." - - -if [[ "${POSTGRES_USER}" == "postgres" ]]; then - message_error "Backing up as 'postgres' user is not supported. Assign 'POSTGRES_USER' env with another one and try again." - exit 1 -fi - -export PGHOST="${POSTGRES_HOST}" -export PGPORT="${POSTGRES_PORT}" -export PGUSER="${POSTGRES_USER}" -export PGPASSWORD="${POSTGRES_PASSWORD}" -export PGDATABASE="${POSTGRES_DB}" - -backup_filename="${BACKUP_FILE_PREFIX}_$(date +'%Y_%m_%dT%H_%M_%S').sql.gz" -pg_dump | gzip > "${BACKUP_DIR_PATH}/${backup_filename}" - - -message_success "'${POSTGRES_DB}' database backup '${backup_filename}' has been created and placed in '${BACKUP_DIR_PATH}'." diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backups b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backups deleted file mode 100644 index 0484ccff5..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backups +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - - -### View backups. -### -### Usage: -### $ docker-compose -f .yml (exec |run --rm) postgres backups - - -set -o errexit -set -o pipefail -set -o nounset - - -working_dir="$(dirname ${0})" -source "${working_dir}/_sourced/constants.sh" -source "${working_dir}/_sourced/messages.sh" - - -message_welcome "These are the backups you have got:" - -ls -lht "${BACKUP_DIR_PATH}" diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore deleted file mode 100644 index 9661ca7f1..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - - -### Restore database from a backup. -### -### Parameters: -### <1> filename of an existing backup. -### -### Usage: -### $ docker-compose -f .yml (exec |run --rm) postgres restore <1> - - -set -o errexit -set -o pipefail -set -o nounset - - -working_dir="$(dirname ${0})" -source "${working_dir}/_sourced/constants.sh" -source "${working_dir}/_sourced/messages.sh" - - -if [[ -z ${1+x} ]]; then - message_error "Backup filename is not specified yet it is a required parameter. Make sure you provide one and try again." - exit 1 -fi -backup_filename="${BACKUP_DIR_PATH}/${1}" -if [[ ! -f "${backup_filename}" ]]; then - message_error "No backup with the specified filename found. Check out the 'backups' maintenance script output to see if there is one and try again." - exit 1 -fi - -message_welcome "Restoring the '${POSTGRES_DB}' database from the '${backup_filename}' backup..." - -if [[ "${POSTGRES_USER}" == "postgres" ]]; then - message_error "Restoring as 'postgres' user is not supported. Assign 'POSTGRES_USER' env with another one and try again." - exit 1 -fi - -export PGHOST="${POSTGRES_HOST}" -export PGPORT="${POSTGRES_PORT}" -export PGUSER="${POSTGRES_USER}" -export PGPASSWORD="${POSTGRES_PASSWORD}" -export PGDATABASE="${POSTGRES_DB}" - -message_info "Dropping the database..." -dropdb "${PGDATABASE}" - -message_info "Creating a new database..." -createdb --owner="${POSTGRES_USER}" - -message_info "Applying the backup to the new database..." -gunzip -c "${backup_filename}" | psql "${POSTGRES_DB}" - -message_success "The '${POSTGRES_DB}' database has been restored from the '${backup_filename}' backup." diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile deleted file mode 100644 index 7088e6fe3..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM traefik:alpine -RUN mkdir -p /etc/traefik/acme -RUN touch /etc/traefik/acme/acme.json -RUN chmod 600 /etc/traefik/acme/acme.json -COPY ./compose/production/traefik/traefik.toml /etc/traefik diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml deleted file mode 100644 index 0f2abe8a1..000000000 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml +++ /dev/null @@ -1,41 +0,0 @@ -logLevel = "INFO" -defaultEntryPoints = ["http", "https"] - -# Entrypoints, http and https -[entryPoints] - # http should be redirected to https - [entryPoints.http] - address = ":80" - [entryPoints.http.redirect] - entryPoint = "https" - # https is the default - [entryPoints.https] - address = ":443" - [entryPoints.https.tls] - -# Enable ACME (Let's Encrypt): automatic SSL -[acme] -# Email address used for registration -email = "{{ cookiecutter.email }}" -storage = "/etc/traefik/acme/acme.json" -entryPoint = "https" -onDemand = false -OnHostRule = true - # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge - [acme.httpChallenge] - entryPoint = "http" - -[file] -[backends] - [backends.django] - [backends.django.servers.server1] - url = "http://django:5000" - -[frontends] - [frontends.django] - backend = "django" - passHostHeader = true - [frontends.django.headers] - HostsProxyHeaders = ['X-CSRFToken'] - [frontends.django.routes.dr1] - rule = "Host:{{ cookiecutter.domain_name }}"