From da7d39d84ed907ea583bcebbaeaa464029ba15e2 Mon Sep 17 00:00:00 2001
From: Paul Warren <pwarren@pwarren.id.au>
Date: Thu, 11 Aug 2022 02:11:16 +0000
Subject: [PATCH] New builder, better dockerfile

---
 Dockerfile   | 26 ++++++++++++++++++--------
 docker_build |  7 ++++---
 2 files changed, 22 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 docker_build

diff --git a/Dockerfile b/Dockerfile
index 51c5b67..1adbfc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,23 @@
-FROM debian:11
-
-MAINTAINER Paul Warren <pwarren@pwarren.id.au>
-
-RUN apt-get update -y && apt-get install -y python3-pip python3-dev
-
-ADD . /app
+FROM python:3.9-slim as builder
 
 WORKDIR /app
 
-RUN pip3 install -r requirements.txt
+RUN apt-get update -y && apt-get install -y --no-install-recommends gcc
+COPY requirements.txt .
+RUN pip3 wheel --no-cache-dir --no-deps --wheel-dir /app/wheels -r requirements.txt
 
+
+FROM python:3.9-slim
+ARG VERSION
+ENV VERSION $VERSION
+ARG BUILD_TIMESTAMP
+ENV BUILD_TIMESTAMP $BUILD_TIMESTAMP
+
+MAINTAINER Paul Warren <pwarren@pwarren.id.au>
+WORKDIR /app
+COPY --from=builder /app/wheels /wheels
+COPY --from=builder /app/requirements.txt /
+RUN pip install --no-cache /wheels/*
+ADD . /app
 ENTRYPOINT ["./gunicorn_start.sh"]
+
diff --git a/docker_build b/docker_build
old mode 100644
new mode 100755
index 15c4062..34e312c
--- a/docker_build
+++ b/docker_build
@@ -1,9 +1,10 @@
+#!/bin/bash
+
 VERSION=$(git log -1 --pretty=%h)
-REPO="dockerhub.kube:5000/desteg:
+REPO="dockerhub.kube:5000/desteg:"
 TAG="$REPO$VERSION"
 LATEST="${REPO}latest"
-TS=$( date '+%F_%H:%M:%S; )\\
+TS=$( date '+%F_%H:%M:%S' )
 docker build -t "$TAG" -t "$LATEST" --build-arg VERSION="$VERSION" --build-arg BUILD_TIMESTAMP="$BUILD_TIMESTAMP" . 
 docker push "$TAG" 
 docker push "$LATEST"
-