Optimize Docker builds

Minimize cache invalidation with improved cache management

auth-domain/.env.dev.example

@@ -1,5 +1,5 @@
 POSTGRES_USER=user
 POSTGRES_PASS=password
 POSTGRES_DB=api_dev
-POSTGRES_DB_TEST=api_prod
+POSTGRES_DB_TEST=api_test
 APP_SETTINGS=src.config.DevelopmentConfig

auth-domain/db/Dockerfile

@@ -1,5 +1,3 @@
-# pull official base image
 FROM postgres:13.3
 
-# run create.sql on init
 ADD create.sql /docker-entrypoint-initdb.d

auth-domain/user-manager/Dockerfile.prod

@@ -1,10 +1,11 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-FROM python:3.11.2-slim-buster AS prod
 
-# set working directory
+COPY --chown=python:python requirements.txt requirements.txt
-WORKDIR /usr/src/app
+RUN python -m pip install --upgrade pip && \
+    python -m pip install -r requirements.txt
+
+COPY --chown=python:python . .
 
-# set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV FLASK_DEBUG 0
@@ -14,24 +15,5 @@ ENV SECRET_KEY $SECRET_KEY
 ARG PORT
 ENV PORT $PORT
 
-RUN apt-get update \
-  && apt-get -y install netcat gcc postgresql \
-  && apt-get clean \
-  && groupadd -g 999 python \
-  && useradd -r -u 999 -g python python \
-  && python -m venv /usr/src/app/.venv \
-  && chown -R python:python /usr/src/app 
-
-ENV PATH="/usr/src/app/.venv/bin:$PATH"
-ENV PIP_NO_CACHE_DIR=off
-USER 999
-
-COPY --chown=python:python requirements.txt requirements.txt
-RUN python -m pip install --upgrade pip && \
-    python -m pip install -r requirements.txt
-
-COPY --chown=python:python . .
-
-# run gunicorn
 CMD ["/usr/src/app/.venv/bin/gunicorn", "manage:app"]
 

auth-domain/user-manager/Dockerfile.prod.dockerignore

@@ -6,4 +6,5 @@ Dockerfile.prod
 .pytest_cache
 htmlcov
 src/tests
-src/.cicd
+src/.cicd
+__pycache__

auth-domain/user-manager/Dockerfile.test

@@ -1,21 +1,18 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
 
-ENV FLASK_DEBUG=1
+COPY --chown=python:python requirements.txt requirements.txt
-ENV FLASK_ENV=development
+RUN python -m pip install --upgrade pip && \
-ENV DATABASE_TEST_URL=postgresql://user:password@usermanager-db:5432/api_test
+    python -m pip install -r requirements.txt
 
-# add and install requirements
 COPY --chown=python:python ./requirements.test.txt .
 RUN python -m pip install -r requirements.test.txt
 
-# add app
+COPY --chown=python:python . .
-COPY --chown=python:python src/tests src/tests
 
-# new
+RUN mv src/.cicd/test.sh . && \
-# add entrypoint.sh
+    chmod +x /usr/src/app/test.sh
-COPY --chown=python:python src/.cicd/test.sh .
-RUN chmod +x /usr/src/app/test.sh
 
-CMD ["/usr/src/app/test.sh"]
+ENV FLASK_DEBUG=1
+ENV FLASK_ENV=development
+
+CMD ["/usr/src/app/test.sh"]

auth-domain/user-manager/Dockerfile.test.dockerignore

@@ -0,0 +1,8 @@
+env
+.venv
+Dockerfile.test
+Dockerfile.prod
+.coverage
+.pytest_cache
+htmlcov
+__pycache__

browser-domain/Dockerfile.test

@@ -4,7 +4,7 @@ COPY package.json .
 COPY package-lock.json .
 RUN npm install
 
-ENV REACT_APP_ENDPOINT "http://127.0.0.1:5001/"
+ENV REACT_APP_ENDPOINT "http://127.0.0.1:5001"
 
 COPY . .
 RUN chmod +x /app/test.sh

flights-domain/db/Dockerfile

@@ -1,5 +1,3 @@
-# pull official base image
 FROM postgres:13.3
 
-# run create.sql on init
 ADD create.sql /docker-entrypoint-initdb.d

flights-domain/flights-information/Dockerfile.prod

@@ -1,26 +1,4 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-FROM python:3.11.2-slim-buster AS prod
-
-# set working directory
-WORKDIR /usr/src/app
-
-# set environment variables
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-ARG SECRET_KEY
-ENV SECRET_KEY $SECRET_KEY
-
-RUN apt-get update \
-  && apt-get -y install netcat gcc curl \
-  && apt-get clean \
-  && groupadd -g 999 python \
-  && useradd -r -u 999 -g python python \
-  && python -m venv /usr/src/app/.venv \
-  && chown -R python:python /usr/src/app 
-
-ENV PATH="/usr/src/app/.venv/bin:$PATH"
-ENV PIP_NO_CACHE_DIR=off
-USER 999
 
 COPY --chown=python:python requirements.txt requirements.txt
 RUN python -m pip install --upgrade pip && \
@@ -28,5 +6,4 @@ RUN python -m pip install --upgrade pip && \
 
 COPY --chown=python:python . .
 
-# run gunicorn
 CMD ["/usr/src/app/.venv/bin/gunicorn", "src.api.main:app", "--worker-class", "uvicorn.workers.UvicornWorker"]

flights-domain/flights-information/Dockerfile.prod.dockerignore

@@ -6,4 +6,5 @@ Dockerfile.prod
 .pytest_cache
 htmlcov
 src/tests
-src/.cicd
+src/.cicd
+__pycache__

flights-domain/flights-information/Dockerfile.test

@@ -1,18 +1,15 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
 
-ENV DATABASE_TEST_URL=postgresql://user:password@flights-api-db:5432/api_test
+COPY --chown=python:python requirements.txt requirements.txt
+RUN python -m pip install --upgrade pip && \
+    python -m pip install -r requirements.txt
 
-# add and install requirements
 COPY --chown=python:python ./requirements.test.txt .
 RUN python -m pip install -r requirements.test.txt
 
-# add app
+COPY --chown=python:python . .
-COPY --chown=python:python src/tests src/tests
 
-# new
+RUN mv src/.cicd/test.sh . && \
-COPY --chown=python:python src/.cicd/test.sh .
+    chmod +x /usr/src/app/test.sh
-RUN chmod +x /usr/src/app/test.sh
 
 CMD ["/usr/src/app/test.sh"]

flights-domain/flights-information/Dockerfile.test.dockerignore

@@ -0,0 +1,8 @@
+env
+.venv
+Dockerfile.test
+Dockerfile.prod
+.coverage
+.pytest_cache
+htmlcov
+__pycache__

flights-domain/flights-information/entrypoint.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-echo "Waiting for postgres..."
-
-while ! nc -z api-db 5432; do
-  sleep 0.1
-done
-
-echo "PostgreSQL started"
-
-python src/api/main.py run -h 0.0.0.0

flights-domain/flights-information/src/.cicd/test.sh

@@ -1,6 +1,5 @@
 #!/bin/bash -e
 
-
 if [ "${TEST_TARGET:-}" = "INTEGRATION" ]; then
     /usr/src/app/.venv/bin/gunicorn src.api.main:app --worker-class uvicorn.workers.UvicornWorker
 else

flights-domain/flights-information/src/api/db.py

@@ -1,8 +1,7 @@
 import os
 
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base, sessionmaker
-from sqlalchemy.orm import sessionmaker
 
 SQLALCHEMY_DATABASE_URL = os.getenv("DATABASE_URL")
 print(SQLALCHEMY_DATABASE_URL)

gateway/Dockerfile.prod

@@ -1,26 +1,4 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-FROM python:3.11.2-slim-buster AS prod
-
-# set working directory
-WORKDIR /usr/src/app
-
-# set environment variables
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-ARG SECRET_KEY
-ENV SECRET_KEY $SECRET_KEY
-
-RUN apt-get update \
-  && apt-get -y install netcat gcc curl \
-  && apt-get clean \
-  && groupadd -g 999 python \
-  && useradd -r -u 999 -g python python \
-  && python -m venv /usr/src/app/.venv \
-  && chown -R python:python /usr/src/app 
-
-ENV PATH="/usr/src/app/.venv/bin:$PATH"
-ENV PIP_NO_CACHE_DIR=off
-USER 999
 
 COPY --chown=python:python requirements.txt requirements.txt
 RUN python -m pip install --upgrade pip && \
@@ -28,5 +6,4 @@ RUN python -m pip install --upgrade pip && \
 
 COPY --chown=python:python . .
 
-# run gunicorn
 CMD ["/usr/src/app/.venv/bin/gunicorn", "src.api.main:app", "--worker-class", "uvicorn.workers.UvicornWorker", "--bind=0.0.0.0:5002"]

gateway/Dockerfile.prod.dockerignore

@@ -6,4 +6,5 @@ Dockerfile.prod
 .pytest_cache
 htmlcov
 src/tests
-src/.cicd
+src/.cicd
+__pycache__

gateway/Dockerfile.test

@@ -1,18 +1,15 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
 
-ENV DATABASE_TEST_URL=postgresql://user:password@flights-api-db:5432/api_test
+COPY --chown=python:python requirements.txt requirements.txt
+RUN python -m pip install --upgrade pip && \
+    python -m pip install -r requirements.txt
 
-# add and install requirements
 COPY --chown=python:python ./requirements.test.txt .
 RUN python -m pip install -r requirements.test.txt
 
-# add app
+COPY --chown=python:python . .
-COPY --chown=python:python src/tests src/tests
 
-# new
+RUN mv src/.cicd/test.sh . && \
-COPY --chown=python:python src/.cicd/test.sh .
+    chmod +x /usr/src/app/test.sh
-RUN chmod +x /usr/src/app/test.sh
 
 CMD ["/usr/src/app/test.sh"]

gateway/Dockerfile.test.dockerignore

@@ -0,0 +1,8 @@
+env
+.venv
+Dockerfile.test
+Dockerfile.prod
+.coverage
+.pytest_cache
+htmlcov
+__pycache__

screen-domain/Dockerfile.test

@@ -4,7 +4,7 @@ COPY package.json .
 COPY package-lock.json .
 RUN npm install
 
-ENV REACT_APP_ENDPOINT "http://127.0.0.1:5001/"
+ENV REACT_APP_ENDPOINT "http://127.0.0.1:5001"
 
 COPY . .
 RUN chmod +x /app/test.sh

subscription-domain/db/Dockerfile

@@ -1,5 +1,3 @@
-# pull official base image
 FROM postgres:13.3
 
-# run create.sql on init
 ADD create.sql /docker-entrypoint-initdb.d

subscription-domain/subscription-manager/Dockerfile.prod

@@ -1,26 +1,4 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-FROM python:3.11.2-slim-buster AS prod
-
-# set working directory
-WORKDIR /usr/src/app
-
-# set environment variables
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-ARG SECRET_KEY
-ENV SECRET_KEY $SECRET_KEY
-
-RUN apt-get update \
-  && apt-get -y install netcat gcc curl \
-  && apt-get clean \
-  && groupadd -g 999 python \
-  && useradd -r -u 999 -g python python \
-  && python -m venv /usr/src/app/.venv \
-  && chown -R python:python /usr/src/app 
-
-ENV PATH="/usr/src/app/.venv/bin:$PATH"
-ENV PIP_NO_CACHE_DIR=off
-USER 999
 
 COPY --chown=python:python requirements.txt requirements.txt
 RUN python -m pip install --upgrade pip && \
@@ -28,5 +6,4 @@ RUN python -m pip install --upgrade pip && \
 
 COPY --chown=python:python . .
 
-# run gunicorn
 CMD ["/usr/src/app/.venv/bin/gunicorn", "src.api.main:app", "--worker-class", "uvicorn.workers.UvicornWorker"]

subscription-domain/subscription-manager/Dockerfile.prod.dockerignore

@@ -6,4 +6,5 @@ Dockerfile.prod
 .pytest_cache
 htmlcov
 src/tests
-src/.cicd
+src/.cicd
+__pycache__

subscription-domain/subscription-manager/Dockerfile.test

@@ -1,18 +1,15 @@
-# pull official base image
+FROM slococo/python-builder:3.11.2
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
 
-ENV DATABASE_TEST_URL=postgresql://user:password@flights-api-db:5432/api_test
+COPY --chown=python:python requirements.txt requirements.txt
+RUN python -m pip install --upgrade pip && \
+    python -m pip install -r requirements.txt
 
-# add and install requirements
 COPY --chown=python:python ./requirements.test.txt .
 RUN python -m pip install -r requirements.test.txt
 
-# add app
+COPY --chown=python:python . .
-COPY --chown=python:python src/tests src/tests
 
-# new
+RUN mv src/.cicd/test.sh . && \
-COPY --chown=python:python src/.cicd/test.sh .
+    chmod +x /usr/src/app/test.sh
-RUN chmod +x /usr/src/app/test.sh
 
 CMD ["/usr/src/app/test.sh"]

subscription-domain/subscription-manager/Dockerfile.test.dockerignore

@@ -0,0 +1,8 @@
+env
+.venv
+Dockerfile.test
+Dockerfile.prod
+.coverage
+.pytest_cache
+htmlcov
+__pycache__