Merge branch 'Ultramarine-Linux:um40' into jade/gitpodyml

.github/workflows/build-docker.yml

@@ -39,7 +39,8 @@ env:
     katsu
     https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm
     https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-40.noarch.rpm
-
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 on:
   push:
     branches: [ "um40" ]
@@ -57,8 +58,6 @@ jobs:
         variant:
           - base/base-docker-x86_64
           - base/base-docker-aarch64
-          - base/devtools-docker-aarch64
-          - base/devtools-docker-x86_64
 
     outputs:
       artifact: ${{ matrix.variant }}
@@ -115,8 +114,6 @@ jobs:
       #### DOCKER PUSH ######
 
   docker-push:
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     needs: docker
     if: github.event_name != 'pull_request'
@@ -148,5 +145,50 @@ jobs:
           # also tag as latest
           buildah tag $MANIFEST $MANIFEST:latest || :
           buildah manifest push --all --format v2s2 $MANIFEST docker://$MANIFEST:$RELEASE
+    
+  docker-layer:
+    permissions:
+        contents: read
+        packages: write
+    runs-on: ubuntu-latest
+    needs: docker-push
+    strategy:
+        fail-fast: true
+        matrix:
+            version:
+                - 40
+            docker:
+                - dockerfile: dockerfiles/devtools.dockerfile
+                  image: ghcr.io/ultramarine-linux/ultramarine-devtools
+                - dockerfile: dockerfiles/gitpod.dockerfile
+                  image: ghcr.io/ultramarine-linux/ultramarine-gitpod
+
+    steps:
+        - name: Checkout
+          uses: actions/checkout@v2
+        - name: Set up QEMU
+          uses: docker/setup-qemu-action@v3
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
+        - name: Log into registry ${{ env.REGISTRY }}
+          uses: docker/[email protected]
+          with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+
+        - name: Build images
+          uses: docker/build-push-action@v6
+          with:
+              context: .
+              file: ${{ matrix.docker.dockerfile }}
+              platforms: linux/amd64,linux/arm64
+              push: true
+              tags: |
+                  ${{ matrix.docker.image }}:${{ matrix.version }}
+                  ${{ matrix.docker.image }}:latest
+              build-args: |
+                  RELEASE=${{ matrix.version }}
+    
 
   #### LIVE ISO ####

dockerfiles/devtools.dockerfile

@@ -0,0 +1,5 @@
+ARG RELEASE
+
+FROM ghcr.io/ultramarine-linux/ultramarine:${RELEASE}
+
+RUN dnf install -y @development-tools && dnf clean all

dockerfiles/gitpod.dockerfile

@@ -0,0 +1,9 @@
+ARG RELEASE
+
+FROM ghcr.io/ultramarine-linux/ultramarine:${RELEASE}
+
+RUN dnf install -y @development-tools sudo && dnf clean all
+
+RUN useradd -l -u 33333 -G wheel -md /home/gitpod -s /bin/bash -p gitpod gitpod
+
+USER gitpod