delivery: fix dockerfile (#46)

* delivery: fix dockerfile

* update pylint

.github/workflows/linter.yml

@@ -8,9 +8,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.10"]
         poetry-version: [1.1.11]
-        os: [ubuntu-18.04]
+        os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

delivery/Dockerfile

@@ -0,0 +1,50 @@
+FROM python:3.10.9-slim-bullseye as base
+
+RUN apt update && apt upgrade -y && \
+    apt install jq curl -y
+
+FROM base as builder
+
+WORKDIR /app
+
+RUN apt install build-essential libssl-dev libffi-dev python3-dev cargo -y
+
+RUN curl -sSL https://install.python-poetry.org | python - && \
+    cd /usr/local/bin && \
+    ln -s /root/.local/bin/poetry
+
+ENV POETRY_VIRTUALENVS_CREATE false
+
+RUN pip install virtualenv && \
+    virtualenv /app/.venv
+
+ENV PATH="/app/.venv/bin:$PATH"
+
+COPY pyproject.toml poetry.lock README.md ./
+RUN poetry install --only main --no-root
+
+COPY ./app ./app
+RUN poetry install --only main
+
+FROM base
+
+WORKDIR /app
+
+COPY --from=builder /app/pyproject.toml /app/poetry.lock /app/README.md ./
+COPY alembic/ /app/alembic
+COPY alembic.ini /app/
+COPY --from=builder /app/app ./app
+COPY --from=builder /app/.venv ./.venv
+COPY ./delivery /delivery
+COPY ./scripts /scripts
+
+RUN chmod +x /delivery/*.sh
+
+EXPOSE 8080
+
+ENV IS_PRODUCTION=true
+ENV PATH="/app/.venv/bin:$PATH"
+
+ENTRYPOINT [ "/delivery/entrypoint.sh" ]
+
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8080"]

entrypoint.sh → delivery/entrypoint.sh

@@ -1,18 +1,18 @@
-#! /usr/bin/env sh
+#! /usr/bin/env bash
 set -e
 
 if [[ -z "${WAIT_FOR_IT_ADDRESS}" ]]; then
   echo "Skipping wait-for-it ($$WAIT_FOR_IT_ADDRESS is not defined)"
 else
   echo "running wait-for-it.sh -t 120 ${WAIT_FOR_IT_ADDRESS}"
-  /wait-for-it.sh -t 120 "${WAIT_FOR_IT_ADDRESS}"
+  /delivery/wait-for-it.sh -t 120 "${WAIT_FOR_IT_ADDRESS}"
 fi
 
 echo "Ensuring database existence"
-python ./scripts/ensure-database.py
+python /scripts/ensure-database.py
 
 echo "Upgrading database"
 alembic upgrade head
 
 echo "Launching uvicorn server"
-exec uvicorn app.main:app --host 0.0.0.0 --port ${PORT}
+exec uvicorn app.main:app --host 0.0.0.0 --port 8000

delivery/wait-for-it.sh

@@ -0,0 +1,182 @@
+#!/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

docker-compose.yaml

@@ -2,10 +2,16 @@ version: "3.8"
 
 services:
   app:
-    build: .
-    env_file:
-      - .env
+    build:
+      context: .
+      dockerfile: delivery/Dockerfile
     environment:
+      - API_TOKEN=ea47540d-6bc8-43b6-bae8-233cc904fdd0
+      - S3_BUCKET_NAME=meal-planner-bucket
+      - NOTION_BLOCK_ID=d63fff16-d646-4ed9-932a-f3917c0c5800
+      - NOTION_KEY=whatever
+      - TODOIST_PROJECT_ID=123456789
+      - TODOIST_TOKEN=whatever
       - MYSQL_USER=root
       - MYSQL_PASSWORD=root
       - MYSQL_HOST=database