From fba399250c08ed47c4aeed35c5a680ac9be074e5 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Fri, 24 May 2024 12:38:34 +0200
Subject: [PATCH] 1 image ref to change when we bump ubuntu + fix toil-storage
 build

---
 .github/workflows/images.yaml        | 16 ++++++++++++++++
 Dockerfile => docker-base/Dockerfile |  0
 git/Dockerfile                       |  2 +-
 headless-chrome/Dockerfile           |  2 +-
 runtime-quarkus-ubuntu/Dockerfile    |  2 +-
 test.sh                              |  1 +
 6 files changed, 20 insertions(+), 3 deletions(-)
 rename Dockerfile => docker-base/Dockerfile (100%)

diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index 4116f2f..a5fab17 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -40,6 +40,20 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     ### build steps below are generated ###
+    -
+      name: Build and push docker-base latest
+      uses: docker/build-push-action@v5
+      env:
+        SOURCE_DATE_EPOCH: 0
+      with:
+        context: docker-base
+        tags: |
+          ghcr.io/yolean/docker-base:latest
+          ghcr.io/yolean/docker-base:${{ github.sha }}
+        platforms: linux/amd64,linux/arm64/v8
+        push: true
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
     -
       name: Build and push builder-base latest
       uses: docker/build-push-action@v5
@@ -410,6 +424,8 @@ jobs:
         push: true
         cache-from: type=gha
         cache-to: type=gha,mode=max
+        build-contexts: |
+          yolean/docker-base=docker-image://ghcr.io/yolean/docker-base
     -
       name: Build and push runtime-quarkus-ubuntu latest
       uses: docker/build-push-action@v5
diff --git a/Dockerfile b/docker-base/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker-base/Dockerfile
diff --git a/git/Dockerfile b/git/Dockerfile
index 7cc57b3..10ca3c4 100644
--- a/git/Dockerfile
+++ b/git/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM ubuntu:24.04@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8
+FROM --platform=$TARGETPLATFORM yolean/docker-base
 
 RUN groupadd --gid 1000 git \
   && useradd --uid 1000 --gid git --shell /bin/bash --create-home git
diff --git a/headless-chrome/Dockerfile b/headless-chrome/Dockerfile
index 628ae2b..dbd507f 100644
--- a/headless-chrome/Dockerfile
+++ b/headless-chrome/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8
+FROM --platform=$TARGETPLATFORM yolean/docker-base
 ARG chrome_stage=stable
 ARG chrome_build=125.0.6422.112-1
 
diff --git a/runtime-quarkus-ubuntu/Dockerfile b/runtime-quarkus-ubuntu/Dockerfile
index e3318d2..aa4db71 100644
--- a/runtime-quarkus-ubuntu/Dockerfile
+++ b/runtime-quarkus-ubuntu/Dockerfile
@@ -1,5 +1,5 @@
 # ystack/runner
-FROM --platform=$TARGETPLATFORM ubuntu:24.04@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8
+FROM --platform=$TARGETPLATFORM yolean/docker-base
 
 RUN set -ex; \
   export DEBIAN_FRONTEND=noninteractive; \
diff --git a/test.sh b/test.sh
index 2860659..1fbe6da 100755
--- a/test.sh
+++ b/test.sh
@@ -16,6 +16,7 @@ if [[ ! -z "$SOURCE_COMMIT" ]]; then
 fi
 
 MULTIARCH_NONROOT="
+docker-base
 builder-base
 builder-base-gcc
 builder-base-gcloud