diff --git a/app/Dockerfile b/app/Dockerfile index 936a173..2f54edc 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,13 +1,10 @@ -FROM python:3.12.4-slim-bookworm +FROM python:3.12.4-alpine3.20 ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 WORKDIR /usr/src/app -RUN apt-get -y update -RUN apt-get -y upgrade - RUN python -m pip install --upgrade --upgrade-strategy eager pip RUN mkdir -p /usr/src/app diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh index e606e25..6b56000 100644 --- a/app/docker-entrypoint.sh +++ b/app/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # Abort the entire script if an error occurs set -e diff --git a/app/pg_dump.sh b/app/pg_dump.sh index 72ec7c7..22a939b 100644 --- a/app/pg_dump.sh +++ b/app/pg_dump.sh @@ -1,3 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -PGPASSWORD="$JOB_HISTORY_DB_PASSWORD" pg_dump --file=backup_to_restore.sql --format=p --clean --encoding=utf8 --if-exists --dbname=$JOB_HISTORY_DB_NAME --host=$JOB_HISTORY_DB_HOST --port=$JOB_HISTORY_DB_PORT --username=$JOB_HISTORY_DB_USERNAME +PGPASSWORD="$JOB_HISTORY_DB_PASSWORD" pg_dump --file=backup_to_restore.sql --format=p --clean --encoding=utf8 --if-exists --dbname="$JOB_HISTORY_DB_NAME" --host="$JOB_HISTORY_DB_HOST" --port=$JOB_HISTORY_DB_PORT --username="$JOB_HISTORY_DB_USERNAME" diff --git a/app/requirements.txt b/app/requirements.txt index a5a445a..7f6b3d0 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,5 +1,5 @@ asgiref==3.8.1 -astroid==3.2.3 +astroid==3.2.4 colorama==0.4.6 dill==0.3.8 Django==4.2.14 @@ -11,7 +11,7 @@ platformdirs==4.2.2 pylint==3.2.5 pytz==2024.1 six==1.16.0 -sqlparse==0.5.0 +sqlparse==0.5.1 tomlkit==0.13.0 wheel==0.43.0 whitenoise==6.7.0 diff --git a/app/tcp-port-wait.sh b/app/tcp-port-wait.sh index 356a52d..ad6ff2d 100644 --- a/app/tcp-port-wait.sh +++ b/app/tcp-port-wait.sh @@ -1,16 +1,17 @@ -#!/usr/bin/env bash -set -e +#!/bin/sh -if [ -z "$1" -o -z "$2" ] +set -e + +if [ -z "$1" ] || [ -z "$2" ] then echo "tcp-port-wait - block until specified TCP port becomes available" - echo "Usage: ntcp-port-wait HOST PORT" + echo "Usage: tcp-port-wait HOST PORT" exit 1 fi -echo Waiting for port $1:$2 to become available... -while ! nc -z $1 $2 2>/dev/null +echo Waiting for port "$1":$2 to become available... +while ! nc -z "$1" $2 2>/dev/null do - let elapsed=elapsed+1 + elapsed=$elapsed+1 if [ "$elapsed" -gt 90 ] then echo "TIMED OUT !"