slococo
/
fids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize Docker builds 

Minimize cache invalidation with improved cache management
This commit is contained in:
Santiago Lo Coco 2023-11-04 23:13:02 -03:00
parent cc40e6636c
commit 9210ce98f8
26 changed files with 85 additions and 3915 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth-domain/.env.dev.example
View File

@ -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

2
auth-domain/db/Dockerfile
View File

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

30
auth-domain/user-manager/Dockerfile.prod
View File

@ -1,10 +1,11 @@
# pull official base image
FROM python:3.11.2-slim-buster AS prod
FROM slococo/python-builder:3.11.2
# set working directory
WORKDIR /usr/src/app
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 . .
# 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"]

1
auth-domain/user-manager/Dockerfile.prod.dockerignore
View File

@ -7,3 +7,4 @@ Dockerfile.prod
htmlcov
src/tests
src/.cicd
__pycache__

23
auth-domain/user-manager/Dockerfile.test
View File

@ -1,21 +1,18 @@
# pull official base image
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
FROM slococo/python-builder:3.11.2
ENV FLASK_DEBUG=1
ENV FLASK_ENV=development
ENV DATABASE_TEST_URL=postgresql://user:password@usermanager-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 src/tests src/tests
COPY --chown=python:python . .
# new
# add entrypoint.sh
COPY --chown=python:python src/.cicd/test.sh .
RUN chmod +x /usr/src/app/test.sh
RUN mv src/.cicd/test.sh . && \
chmod +x /usr/src/app/test.sh
ENV FLASK_DEBUG=1
ENV FLASK_ENV=development
CMD ["/usr/src/app/test.sh"]

8
auth-domain/user-manager/Dockerfile.test.dockerignore Normal file
View File

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

2
browser-domain/Dockerfile.test
View File

@ -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

3748
db.sql
View File

File diff suppressed because it is too large Load Diff

2
flights-domain/db/Dockerfile
View File

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

25
flights-domain/flights-information/Dockerfile.prod
View File

@ -1,26 +1,4 @@
# pull official base image
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
FROM slococo/python-builder:3.11.2
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"]

1
flights-domain/flights-information/Dockerfile.prod.dockerignore
View File

@ -7,3 +7,4 @@ Dockerfile.prod
htmlcov
src/tests
src/.cicd
__pycache__

17
flights-domain/flights-information/Dockerfile.test
View File

@ -1,18 +1,15 @@
# pull official base image
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
FROM slococo/python-builder:3.11.2
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 src/tests src/tests
COPY --chown=python:python . .
# new
COPY --chown=python:python src/.cicd/test.sh .
RUN chmod +x /usr/src/app/test.sh
RUN mv src/.cicd/test.sh . && \
chmod +x /usr/src/app/test.sh
CMD ["/usr/src/app/test.sh"]

8
flights-domain/flights-information/Dockerfile.test.dockerignore Normal file
View File

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

11
flights-domain/flights-information/entrypoint.sh
View File

@ -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

1
flights-domain/flights-information/src/.cicd/test.sh
View File

@ -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

3
flights-domain/flights-information/src/api/db.py
View File

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

25
gateway/Dockerfile.prod
View File

@ -1,26 +1,4 @@
# pull official base image
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
FROM slococo/python-builder:3.11.2
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"]

1
gateway/Dockerfile.prod.dockerignore
View File

@ -7,3 +7,4 @@ Dockerfile.prod
htmlcov
src/tests
src/.cicd
__pycache__

17
gateway/Dockerfile.test
View File

@ -1,18 +1,15 @@
# pull official base image
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
FROM slococo/python-builder:3.11.2
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 src/tests src/tests
COPY --chown=python:python . .
# new
COPY --chown=python:python src/.cicd/test.sh .
RUN chmod +x /usr/src/app/test.sh
RUN mv src/.cicd/test.sh . && \
chmod +x /usr/src/app/test.sh
CMD ["/usr/src/app/test.sh"]

8
gateway/Dockerfile.test.dockerignore Normal file
View File

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

2
screen-domain/Dockerfile.test
View File

@ -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

2
subscription-domain/db/Dockerfile
View File

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

25
subscription-domain/subscription-manager/Dockerfile.prod
View File

@ -1,26 +1,4 @@
# pull official base image
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
FROM slococo/python-builder:3.11.2
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"]

1
subscription-domain/subscription-manager/Dockerfile.prod.dockerignore
View File

@ -7,3 +7,4 @@ Dockerfile.prod
htmlcov
src/tests
src/.cicd
__pycache__

17
subscription-domain/subscription-manager/Dockerfile.test
View File

@ -1,18 +1,15 @@
# pull official base image
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
FROM slococo/python-builder:3.11.2
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 src/tests src/tests
COPY --chown=python:python . .
# new
COPY --chown=python:python src/.cicd/test.sh .
RUN chmod +x /usr/src/app/test.sh
RUN mv src/.cicd/test.sh . && \
chmod +x /usr/src/app/test.sh
CMD ["/usr/src/app/test.sh"]

8
subscription-domain/subscription-manager/Dockerfile.test.dockerignore Normal file
View File

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