From 126f6bf56d72e7a0fc0df80327c79bbbc8061df9 Mon Sep 17 00:00:00 2001
From: Bulat Kurbanov <kurbanovbul@gmail.com>
Date: Fri, 6 May 2022 10:04:43 +0300
Subject: [PATCH] Update image building

---
 docker/build.dockerfile | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/docker/build.dockerfile b/docker/build.dockerfile
index f57fd08..e19c3ee 100644
--- a/docker/build.dockerfile
+++ b/docker/build.dockerfile
@@ -1,38 +1,26 @@
-FROM python:3.10-slim as build-image
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y gcc build-essential python3-dev libpq-dev libffi-dev \
-    && rm -rf /var/lib/apt/lists/*
+FROM ghcr.io/kurbezz/base_docker_images:3.10-postgres-asyncpg-poetry-buildtime as build-image
 
 WORKDIR /root/poetry
 COPY pyproject.toml poetry.lock /root/poetry/
 
-RUN pip install poetry wheel --no-cache-dir \
-    && poetry export --without-hashes > requirements.txt
-
 ENV VENV_PATH=/opt/venv
 
-RUN python -m venv $VENV_PATH \
+RUN poetry export --without-hashes > requirements.txt \
     && . /opt/venv/bin/activate \
     && pip install -r requirements.txt --no-cache-dir
 
 
-FROM python:3.10-slim as runtime-image
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y python3-dev libpq-dev libffi-dev \
-    && rm -rf /var/lib/apt/lists/*
+FROM ghcr.io/kurbezz/base_docker_images:3.10-postgres-runtime as runtime-image
 
 WORKDIR /app
 
-COPY ./fastapi_book_server/ /app/
-
 ENV VENV_PATH=/opt/venv
-COPY --from=build-image $VENV_PATH $VENV_PATH
 ENV PATH="$VENV_PATH/bin:$PATH"
 
-COPY ./scripts/start.sh /root/
-COPY ./scripts/healthcheck.py /root/
+COPY ./fastapi_book_server/ /app/
+COPY ./scripts/* /root/
+
+COPY --from=build-image $VENV_PATH $VENV_PATH
 
 EXPOSE 8080