From 1e6183134c45e3a0d162d91dc22c9d7bddb16e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Wed, 23 Aug 2023 22:07:29 +0200
Subject: [PATCH] ci: also build a minimal docker image

---
 .woodpecker.yml |  3 +++
 Earthfile       | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 22559da..ee7d893 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -89,6 +89,7 @@ pipeline:
       - echo $${DOCKER_PASSWORD}| docker login --username $${DOCKER_USER} --password-stdin
       - mkdir ~/.earthly && echo "$EARTHLY_CONFIGURATION" > ~/.earthly/config.yaml
       - earthly bootstrap
+      - earthly --push +docker-minimal
       - earthly --push +docker
 
   docker:release:
@@ -104,6 +105,8 @@ pipeline:
       - echo $${DOCKER_PASSWORD}| docker login --username $${DOCKER_USER} --password-stdin
       - mkdir ~/.earthly && echo "$EARTHLY_CONFIGURATION" > ~/.earthly/config.yaml
       - earthly bootstrap
+      - earthly --push +docker-minimal --tag=latest
+      - earthly --push +docker-minimal --tag=$CI_COMMIT_TAG
       - earthly --push +docker --tag=latest
       - earthly --push +docker --tag=$CI_COMMIT_TAG
     when:
diff --git a/Earthfile b/Earthfile
index 8ef36ad..79db3bb 100644
--- a/Earthfile
+++ b/Earthfile
@@ -14,15 +14,8 @@ appimage:
   RUN pipx run appimage-builder
   SAVE ARTIFACT UpEnd* AS LOCAL dist/
 
-docker:
+docker-minimal:
   FROM debian:bookworm
-  RUN apt-get update && \
-    apt-get -y install libssl3 ffmpeg wget && \
-    wget https://github.com/bbc/audiowaveform/releases/download/1.8.1/audiowaveform_1.8.1-1-12_amd64.deb && \
-    apt -y install ./audiowaveform_1.8.1-1-12_amd64.deb && \
-    rm -v audiowaveform_1.8.1-1-12_amd64.deb && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
   COPY +upend-bin/upend /usr/bin/upend
   COPY --dir +webui/dist /usr/share/upend/webui
   ENTRYPOINT ["/usr/bin/upend"]
@@ -31,6 +24,17 @@ docker:
   ENV UPEND_NO_DESKTOP=true
   ENV UPEND_ALLOW_HOST='*'
   ARG tag=trunk
+  SAVE IMAGE --push upend/upend:$tag-minimal
+
+docker:
+  FROM +docker-minimal
+  RUN apt-get update && \
+    apt-get -y install libssl3 ffmpeg wget && \
+    wget https://github.com/bbc/audiowaveform/releases/download/1.8.1/audiowaveform_1.8.1-1-12_amd64.deb && \
+    apt -y install ./audiowaveform_1.8.1-1-12_amd64.deb && \
+    rm -v audiowaveform_1.8.1-1-12_amd64.deb && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
   SAVE IMAGE --push upend/upend:$tag
 
 upend-bin: