From 505e5665fb5a000955a56ee2f301abbe3cd091ff Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Mon, 29 Jul 2024 06:52:30 +0800
Subject: [PATCH] added base image for arch builder

---
 .gitea/workflows/build-arch-builder.yaml | 18 ++++++++++++++++--
 arch-builder/Dockerfile                  |  3 ++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml
index 51baa95..84ec914 100644
--- a/.gitea/workflows/build-arch-builder.yaml
+++ b/.gitea/workflows/build-arch-builder.yaml
@@ -22,7 +22,20 @@ jobs:
           username: woggioni
           password: ${{ secrets.PUBLISHER_TOKEN }}
       -
-        name: Build and push arch-builder images
+        name: Build and push arch-builder base images
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:arch-builder"
+          platforms: linux/amd64
+          push: true
+          pull: true
+          tags: |
+            "gitea.woggioni.net/woggioni/arch-builder:base"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx          
+          target: base
+      -
+        name: Build and push arch-builder rootless images
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}:arch-builder"
@@ -31,6 +44,7 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:latest"
+            "gitea.woggioni.net/woggioni/arch-builder:rootless"
           cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx
           cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx          
-
+          target: rootless
diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile
index fa9b0dd..080de7b 100644
--- a/arch-builder/Dockerfile
+++ b/arch-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux:latest
+FROM archlinux:latest AS base
 
 COPY mirrorlist /etc/pacman.d/mirrolist
 
@@ -66,6 +66,7 @@ RUN pacman -S --noconfirm --needed \
     clang \
     jdk21-openjdk 
 
+FROM base as rootless
 RUN useradd luser -G users -u 1000 -s /bin/bash -m -d /home/luser
 USER luser
 WORKDIR /home/luser