remove wait-for-it, fix python venv

.dockerignore

@@ -2,4 +2,4 @@
 node_modules
 /app/frontend/public/build
 /app/frontend/scripts
-db.sqlite3
+**/db.sqlite3

Dockerfile

@@ -6,10 +6,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 WORKDIR /python-build
 RUN apt-get update &&\
 apt-get install -y --no-install-recommends build-essential python3 python3-dev python3-pip python3-venv default-libmysqlclient-dev libpq-dev &&\
-python3 -m venv /python-build/venv
-ENV PATH="/python-build/venv/bin:$PATH"
+python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 COPY app/backend/requirements.txt .
-RUN python3 -m pip install --no-cache-dir --upgrade pip &&\
+RUN python3 -m pip install --no-cache-dir --upgrade pip wheel &&\
 pip install --no-cache-dir -r requirements.txt
 
 FROM node:17-bullseye-slim as node-build
@@ -27,8 +27,8 @@ RUN apt-get update &&\
 apt-get install -y --no-install-recommends default-mysql-client nodejs npm iputils-ping nmap &&\
 apt-get clean &&\
 rm -rf /var/lib/{apt,dpkg,cache,log}/
-COPY --from=python-build /python-build/venv /app/venv
-ENV PATH="/app/venv/bin:$PATH"
+COPY --from=python-build /opt/venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 COPY --from=node-build /node-build ./frontend
 COPY app/backend ./backend
 COPY app/run.sh ./

app/backend/wait-for-it.sh

@@ -1,182 +0,0 @@
-#!/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 -n > /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)
-
-WAITFORIT_BUSYTIMEFLAG=""
-if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-    WAITFORIT_ISBUSY=1
-    # Check if busybox timeout uses -t flag
-    # (recent Alpine versions don't support -t anymore)
-    if timeout &>/dev/stdout | grep -q -e '-t '; then
-        WAITFORIT_BUSYTIMEFLAG="-t"
-    fi
-else
-    WAITFORIT_ISBUSY=0
-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

app/run.sh

@@ -1,15 +1,5 @@
 #!/bin/sh
 
-cd /app/backend/ || exit
-
-# wait for db and redis
-if [ "${DB_TYPE}" != "sqlite" ]; then
-    /usr/bin/env bash ./wait-for-it.sh "${DB_HOST}":"${DB_PORT}" -t 300 -s
-    echo "sleeping 20"
-    sleep 20
-fi
-/usr/bin/env bash ./wait-for-it.sh "${REDIS_HOST}":"${REDIS_PORT}" -t 300 -s
-
 # set ping interval
 if [ -z "$PING_INTERVAL" ]; then
     PING_INTERVAL=5
@@ -21,6 +11,7 @@ elif [ "$PING_INTERVAL" -lt 5 ]; then
 fi
 
 # create django secret key
+cd /app/backend/ || exit
 if [ -z "$DJANGO_SECRET_KEY" ]; then
     DJANGO_SECRET_KEY=$(python3 -c 'from django.core.management.utils import get_random_secret_key; print(get_random_secret_key())')
     export DJANGO_SECRET_KEY

docker-compose-mysql.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
-  upsnap_django:
-    container_name: upsnap_django
+  app:
+    container_name: upsnap_app
     image: seriousm4x/upsnap:latest
     network_mode: host
     restart: unless-stopped
@@ -24,9 +24,11 @@ services:
       #- DJANGO_LANGUAGE_CODE=de # optional (default: en)
       #- DJANGO_TIME_ZONE=Europe/Berlin # optional (default: UTC)
     depends_on:
-      - upsnap_redis
-      - upsnap_mysql
-  upsnap_redis:
+      redis:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy
+  redis:
     container_name: upsnap_redis
     image: redis:alpine
     ports:
@@ -35,7 +37,7 @@ services:
     healthcheck:
       test: redis-cli ping
       interval: 10s
-  upsnap_mysql:
+  mysql:
     container_name: upsnap_mysql
     image: mysql
     restart: unless-stopped

docker-compose-postgres.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
-  upsnap_django:
-    container_name: upsnap_django
+  app:
+    container_name: upsnap_app
     image: seriousm4x/upsnap:latest
     network_mode: host
     restart: unless-stopped
@@ -24,9 +24,11 @@ services:
       #- DJANGO_LANGUAGE_CODE=de # optional (default: en)
       #- DJANGO_TIME_ZONE=Europe/Berlin # optional (default: UTC)
     depends_on:
-      - upsnap_redis
-      - upsnap_postgres
-  upsnap_redis:
+      redis:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+  redis:
     container_name: upsnap_redis
     image: redis:alpine
     ports:
@@ -35,7 +37,7 @@ services:
     healthcheck:
       test: redis-cli ping
       interval: 10s
-  upsnap_postgres:
+  postgres:
     container_name: upsnap_postgres
     image: postgres:14-alpine
     ports:

docker-compose-sqlite.yml

@@ -19,7 +19,8 @@ services:
       #- DJANGO_LANGUAGE_CODE=de # optional (default: en)
       #- DJANGO_TIME_ZONE=Europe/Berlin # optional (default: UTC)
     depends_on:
-      - upsnap_redis
+      redis:
+        condition: service_healthy
   redis:
     container_name: upsnap_redis
     image: redis:alpine