Merge pull request #170 from johnpooch/develop

v0.2.0

.docker/Dockerfile

@@ -1,13 +1,41 @@
-FROM python:latest
+FROM python:latest AS diplomacy-base
+
+ARG DOCKER_UID
+ARG ENV=prod
+ARG INSTALL_DIR=/opt/diplomacy
+
+ENV ENV=$ENV
+ENV INSTALL_DIR=$INSTALL_DIR
+ENV PATH="$PATH:/home/app/.local/bin:$INSTALL_DIR/.bin"
 ENV PYTHONUNBUFFERED 1
 
-ENV PATH="$PATH:/home/app/.local/bin"
+RUN useradd -u ${DOCKER_UID:-2000} -ms /bin/bash app
+RUN install -d -g app -o app $INSTALL_DIR/.bin $INSTALL_DIR/diplomacy
+RUN chown -R app:app $INSTALL_DIR/.bin
+ADD --chown=app:app .docker/bin $INSTALL_DIR/.bin
+
+
+FROM diplomacy-base AS diplomacy-deps
+
+RUN install -d -g app -o app $INSTALL_DIR/.deps
 
-WORKDIR /code
-COPY . /code
+USER app
+WORKDIR $INSTALL_DIR/.deps
 
+ADD --chown=app:app ./*requirements.txt $INSTALL_DIR/.deps/
 RUN pip install --upgrade pip
 RUN pip install -r requirements.txt
 
+FROM diplomacy-deps AS diplomacy-service
+
+WORKDIR $INSTALL_DIR
+
+COPY --from=diplomacy-deps --chown=app:app /home/app /home/app
+
+WORKDIR "$INSTALL_DIR/diplomacy"
 EXPOSE 8000
-ENTRYPOINT .docker/deploy/start.sh
+ENTRYPOINT ["start-service"]
+
+FROM diplomacy-service AS diplomacy-worker
+
+ENTRYPOINT ["start-worker"]

.docker/bin/_start.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if (( $RUNTIMEINSTALL )); then
+    echo Installing any changed requirements...
+    .docker/deploy/install_requirements.sh $ENV
+fi
+
+if [ $RUNMIGRATIONS ]; then
+    echo Running migrations...
+    manage migrate
+fi
+
+for target in $WAITFOR; do
+    wait-for-it $target --timeout=120
+done

.docker/bin/install_requirements

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+pip install --user -r requirements.txt --index-url https://pypi.gamer-network.net/gamernetwork/dev/+simple/
+
+ENV=$1
+
+if [ "$ENV" == "dev" ]
+then
+    pip install --user -r dev_requirements.txt
+fi

.docker/bin/manage

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+python "${INSTALL_DIR}/diplomacy/manage.py" $@
+exit $?

.docker/bin/start-service

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source "${INSTALL_DIR}/.bin/_start.sh"
+
+while [ 1 ]; do
+    echo Starting Runserver.
+    manage runserver 0.0.0.0:8000
+    sleep 5
+done

.docker/bin/start-worker

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source "${INSTALL_DIR}/.bin/_start.sh"
+
+while [ 1 ]; do
+    echo Starting Celery worker.
+    manage runcelery
+    sleep 5
+done

.docker/bin/wait-for-it

@@ -0,0 +1,177 @@
+#!/usr/bin/env bash
+#   Use this script to test if a given TCP host/port are available
+
+cmdname=$(basename $0)
+
+echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $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 [[ $TIMEOUT -gt 0 ]]; then
+        echoerr "$cmdname: waiting $TIMEOUT seconds for $HOST:$PORT"
+    else
+        echoerr "$cmdname: waiting for $HOST:$PORT without a timeout"
+    fi
+    start_ts=$(date +%s)
+    while :
+    do
+        if [[ $ISBUSY -eq 1 ]]; then
+            nc -z $HOST $PORT
+            result=$?
+        else
+            (echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
+            result=$?
+        fi
+        if [[ $result -eq 0 ]]; then
+            end_ts=$(date +%s)
+            echoerr "$cmdname: $HOST:$PORT is available after $((end_ts - start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $QUIET -eq 1 ]]; then
+        timeout $BUSYTIMEFLAG $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+    else
+        timeout $BUSYTIMEFLAG $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+    fi
+    PID=$!
+    trap "kill -INT -$PID" INT
+    wait $PID
+    RESULT=$?
+    if [[ $RESULT -ne 0 ]]; then
+        echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $HOST:$PORT"
+    fi
+    return $RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        hostport=(${1//:/ })
+        HOST=${hostport[0]}
+        PORT=${hostport[1]}
+        shift 1
+        ;;
+        --child)
+        CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        STRICT=1
+        shift 1
+        ;;
+        -h)
+        HOST="$2"
+        if [[ $HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        PORT="$2"
+        if [[ $PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        TIMEOUT="$2"
+        if [[ $TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$HOST" == "" || "$PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+TIMEOUT=${TIMEOUT:-15}
+STRICT=${STRICT:-0}
+CHILD=${CHILD:-0}
+QUIET=${QUIET:-0}
+
+# check to see if timeout is from busybox?
+# check to see if timeout is from busybox?
+TIMEOUT_PATH=$(realpath $(which timeout))
+if [[ $TIMEOUT_PATH =~ "busybox" ]]; then
+        ISBUSY=1
+        BUSYTIMEFLAG="-t"
+else
+        ISBUSY=0
+        BUSYTIMEFLAG=""
+fi
+
+if [[ $CHILD -gt 0 ]]; then
+    wait_for
+    RESULT=$?
+    exit $RESULT
+else
+    if [[ $TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        RESULT=$?
+    else
+        wait_for
+        RESULT=$?
+    fi
+fi
+
+if [[ $CLI != "" ]]; then
+    if [[ $RESULT -ne 0 && $STRICT -eq 1 ]]; then
+        echoerr "$cmdname: strict mode, refusing to execute subprocess"
+        exit $RESULT
+    fi
+    exec "${CLI[@]}"
+else
+    exit $RESULT
+fi

.github/workflows/django.yml

@@ -1,8 +1,6 @@
 name: Django CI
 
-on:
-  pull_request:
-    branches: [ master, develop ]
+on: push
 
 jobs:
   build:

.github/workflows/lint.yml

@@ -1,8 +1,6 @@
 name: Lint
 
-on:
-  pull_request:
-    branches: [ master, develop ]
+on: push
 
 jobs:
   flake8_py3:

.gitignore

@@ -23,3 +23,9 @@ project/settings/local.py
 docker-compose.override.yml
 
 /env/
+
+# celery beat schedule file
+celerybeat-schedule
+.vscode
+
+local_database

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 John McDowell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.