From d963d0663280770be074900bafabb016b255fdf4 Mon Sep 17 00:00:00 2001 From: Dmitry Titenkov Date: Mon, 17 Nov 2025 22:21:02 +0300 Subject: [PATCH 1/3] docker --- backend/Dockerfile | 10 + backend/bookinn/settings.py | 9 +- requirements.txt => backend/requirements.txt | 1 + backend/wait-for-it.sh | 182 +++++++++++++++++++ infra/docker-compose.yaml | 40 ++++ infra/nginx/default.conf | 21 +++ 6 files changed, 258 insertions(+), 5 deletions(-) create mode 100644 backend/Dockerfile rename requirements.txt => backend/requirements.txt (98%) create mode 100755 backend/wait-for-it.sh create mode 100644 infra/docker-compose.yaml create mode 100644 infra/nginx/default.conf diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000..91f73a8 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.11-slim +LABEL maintainer="Dmitry Titenkov " +LABEL version="1.0" +LABEL description="API for booking hotel rooms" +RUN mkdir /app +COPY requirements.txt /app +RUN pip3 install -r /app/requirements.txt --no-cache-dir -vvv +COPY . /app +WORKDIR /app +CMD [ "gunicorn", "bookinn.wsgi:application". "--bind", "0.0.0.0:8000" ] \ No newline at end of file diff --git a/backend/bookinn/settings.py b/backend/bookinn/settings.py index 314262a..46ca3b2 100644 --- a/backend/bookinn/settings.py +++ b/backend/bookinn/settings.py @@ -57,7 +57,6 @@ }, } - load_dotenv() SECRET_KEY = os.getenv("SECRET_KEY", default="supersecretkey") print(SECRET_KEY) @@ -115,10 +114,10 @@ DATABASES = { "default": { "ENGINE": os.getenv("ENGINE", default="django.db.backends.postgresql"), - "NAME": os.getenv("NAME", default="postgres"), - "USER": os.getenv("USER", default="postgres"), - "PASSWORD": os.getenv("PASSWORD", default="postgres"), - "HOST": os.getenv("HOST", default="localhost"), + "NAME": os.getenv("POSTGRES_DB", default="postgres"), + "USER": os.getenv("POSTGRES_USER", default="postgres"), + "PASSWORD": os.getenv("POSTGRES_PASSWORD", default="postgres"), + "HOST": os.getenv("HOST", default="db"), "PORT": os.getenv("PORT", default="5432"), } } diff --git a/requirements.txt b/backend/requirements.txt similarity index 98% rename from requirements.txt rename to backend/requirements.txt index e61e612..958ff67 100644 --- a/requirements.txt +++ b/backend/requirements.txt @@ -15,6 +15,7 @@ djoser==2.3.3 drf-spectacular==0.29.0 flake8==7.3.0 flake8-isort==6.1.2 +gunicorn==23.0.0 idna==3.11 importlib_metadata==8.7.0 inflection==0.5.1 diff --git a/backend/wait-for-it.sh b/backend/wait-for-it.sh new file mode 100755 index 0000000..d990e0d --- /dev/null +++ b/backend/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 diff --git a/infra/docker-compose.yaml b/infra/docker-compose.yaml new file mode 100644 index 0000000..6997a89 --- /dev/null +++ b/infra/docker-compose.yaml @@ -0,0 +1,40 @@ +version: '3.8' + +services: + db: + image: postgres:15.0-alpine + volumes: + - postgres_data:/var/lib/postgresql/data/ + env_file: + - ./.env + backend: + build: + context: ../backend + restart: always + + volumes: + - static_value:/app/static/ + - media_value:/app/media/ + - swagger:/app/api/docs/ + depends_on: + - db + env_file: + - ./.env + command: ./wait-for-it.sh db:5432 -- gunicorn bookinn.wsgi:application --bind 0.0.0.0:8000 + + nginx: + image: nginx:stable-alpine + ports: + - "8000:80" + volumes: + - static_value:/app/static/ + - media_value:/app/media/ + - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro + depends_on: + - backend + +volumes: + postgres_data: + static_value: + media_value: + swagger: \ No newline at end of file diff --git a/infra/nginx/default.conf b/infra/nginx/default.conf new file mode 100644 index 0000000..9f9792f --- /dev/null +++ b/infra/nginx/default.conf @@ -0,0 +1,21 @@ +server { + listen 80; + + server_name localhost; + + location /static/ { + alias /app/static/; + } + + location /media/ { + alias /app/media/; + } + + location / { + proxy_pass http://backend:8000; + } + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; +} \ No newline at end of file From 4d237a3dd8b9c39790915a689d5b2a03466cf853 Mon Sep 17 00:00:00 2001 From: Dmitry Titenkov Date: Mon, 17 Nov 2025 22:24:02 +0300 Subject: [PATCH 2/3] docker --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 57f3399..f190a31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: run: | python -m pip install --upgrade pip pip install black flake8 flake8-isort - pip install -r requirements.txt + pip install -r ./backend/requirements.txt - name: Test with black (check only) run: | From d4e9c38011a4bb1a536765ba59b1f105da54e98f Mon Sep 17 00:00:00 2001 From: Dmitry Titenkov Date: Mon, 17 Nov 2025 22:25:14 +0300 Subject: [PATCH 3/3] docker --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f190a31..9bbf57a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install black flake8 flake8-isort pip install -r ./backend/requirements.txt - name: Test with black (check only)