From bb496a0e9b5a24a2c9772e97cf4ae68395c96603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:43:13 +0100 Subject: [PATCH 1/9] Add Dockerfile image builder --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1ad5687 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM python:3.6 +ENV PYTHONUNBUFFERED 1 +COPY . /code/ +WORKDIR /code +RUN pip install -r requirements.txt From d675c1733d46e2193bfad8d478bd0120d85ea9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:43:58 +0100 Subject: [PATCH 2/9] Add base composition with web and db --- docker-compose.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..722c9b2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,30 @@ +version: '3' +services: + db: + image: kartoza/postgis:latest + environment: + - POSTGRES_DB=todos + - POSTGRES_USER=todos + - POSTGRES_PASS=kJn4AmbOkJl28gX= + - ALLOW_IP_RANGE=0.0.0.0/0 + ports: + - 35432:5432 + restart: always + + web: + build: . + environment: + - DB_HOST=db + - DB_PORT=5432 + - DB_NAME=todos + - DB_USER=todos + - DB_PASSWORD=kJn4AmbOkJl28gX= + command: ["bash", "./utils/wait-for-it.sh", "db:5432", "--", "bash", "./utils/start-server.sh"] + volumes: + - .:/code + ports: + - "81:8000" + depends_on: + - db + restart: always + From 6136fbaf73cfc033e0176f13a23eb24ae06bc74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:44:18 +0100 Subject: [PATCH 3/9] Integrate wait-for-it script See https://github.com/vishnubob/wait-for-it/blob/master/wait-for-it.sh --- utils/wait-for-it.sh | 178 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100755 utils/wait-for-it.sh diff --git a/utils/wait-for-it.sh b/utils/wait-for-it.sh new file mode 100755 index 0000000..071c2be --- /dev/null +++ b/utils/wait-for-it.sh @@ -0,0 +1,178 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + WAITFORIT_BUSYTIMEFLAG="-t" + +else + WAITFORIT_ISBUSY=0 + WAITFORIT_BUSYTIMEFLAG="" +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi From 183c05cd11d1f1ca1f2e41f58a4ee5a5c188e88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:44:44 +0100 Subject: [PATCH 4/9] Add start server script Reprocess the requirements, apply migrations and start django! --- utils/start-server.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 utils/start-server.sh diff --git a/utils/start-server.sh b/utils/start-server.sh new file mode 100644 index 0000000..d0601a8 --- /dev/null +++ b/utils/start-server.sh @@ -0,0 +1,3 @@ +pip install -r requirements.txt +python manage.py migrate +python manage.py runserver 0.0.0.0:8000 From 8e9c63cf24d16acf0fabfd57d8fbf29ebc812c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:45:13 +0100 Subject: [PATCH 5/9] Add postgres host and port --- todos_project/settings-production.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/todos_project/settings-production.py b/todos_project/settings-production.py index f9609ef..6689b08 100644 --- a/todos_project/settings-production.py +++ b/todos_project/settings-production.py @@ -2,6 +2,8 @@ 'default': { # 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql', + 'HOST': os.environ.get('DB_HOST'), + 'PORT': os.environ.get('DB_PORT'), 'NAME': os.environ.get('DB_NAME'), 'USER': os.environ.get('DB_USER'), 'PASSWORD': os.environ.get('DB_PASSWORD'), From 1ae2752ef8d0fed99ea0167f64c770c090f318da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:48:24 +0100 Subject: [PATCH 6/9] Add base .env file with all our DB vars! --- .env | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..dac31cd --- /dev/null +++ b/.env @@ -0,0 +1,5 @@ +DB_HOST=db +DB_PORT=5432 +DB_NAME=todos +DB_USER=todos +DB_PASSWORD=kJn4AmbOkJl28gX= From cd06e9de7a8eb06701c42d217bed2209baf90ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:52:37 +0100 Subject: [PATCH 7/9] Allow all hosts! --- todos_project/settings-production.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/todos_project/settings-production.py b/todos_project/settings-production.py index 6689b08..4a0ba6e 100644 --- a/todos_project/settings-production.py +++ b/todos_project/settings-production.py @@ -9,3 +9,6 @@ 'PASSWORD': os.environ.get('DB_PASSWORD'), }, } + +ALLOWED_HOSTS = ['*'] + From 58476d56b7445abd69945d5c64baca93da1eb2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:52:50 +0100 Subject: [PATCH 8/9] Use our env definition for DB vars --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 722c9b2..493c9b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,9 @@ services: db: image: kartoza/postgis:latest environment: - - POSTGRES_DB=todos - - POSTGRES_USER=todos - - POSTGRES_PASS=kJn4AmbOkJl28gX= + - POSTGRES_DB=${DB_NAME} + - POSTGRES_USER=${DB_USER} + - POSTGRES_PASS=${DB_PASSWORD} - ALLOW_IP_RANGE=0.0.0.0/0 ports: - 35432:5432 @@ -14,11 +14,11 @@ services: web: build: . environment: - - DB_HOST=db - - DB_PORT=5432 - - DB_NAME=todos - - DB_USER=todos - - DB_PASSWORD=kJn4AmbOkJl28gX= + - DB_HOST=${DB_HOST} + - DB_PORT=${DB_PORT} + - DB_NAME=${DB_NAME} + - DB_USER=${DB_USER} + - DB_PASSWORD=${DB_PASSWORD} command: ["bash", "./utils/wait-for-it.sh", "db:5432", "--", "bash", "./utils/start-server.sh"] volumes: - .:/code From 7dcf81b4f4c9abc122689cdc53a821f69574775e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavi=20Torell=C3=B3?= Date: Thu, 28 Feb 2019 01:55:04 +0100 Subject: [PATCH 9/9] Add section `composition` --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index cd90a44..649f152 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,11 @@ pip install -r requirements.txt ## Presentació http://slides.com/manelclos/django-framework#/ + +## Composició + +S'assumeix que es dipossa de Docker i docker-compose! + +``` +docker-compose up +```