feat: add support for image caching

Signed-off-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
Vanilla-OS · May 10, 2024 · dc7adc4 · dc7adc4
1 parent d54719c
commit dc7adc4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 42 deletions.
diff --git a/.github/workflows/differ.yml b/.github/workflows/differ.yml
@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/vanilla-os/desktop:main
+    if: github.repository == 'vanilla-os/desktop-image'
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml
@@ -2,17 +2,19 @@ name: Vib Build
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - 'main'
+    tags:
+      - '*'
   workflow_dispatch:
+  pull_request:
 
-env:
-    REGISTRY_USER: ${{ github.actor }}
-    REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+permissions:
+    contents: write # Allow actions to create release
+    packages: write # Allow pushing images to GHCR
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -23,12 +25,49 @@ jobs:
         recipe: 'recipe.yml'
         plugins: 'Vanilla-OS/vib-fsguard:v1.4'
 
-    - name: Build the Docker image
-      run: docker image build -f Containerfile --tag ghcr.io/vanilla-os/desktop:main .
+    - uses: actions/upload-artifact@v4
+      with:
+         name: Containerfile
+         path: Containerfile
 
-    # Push the image to GHCR (Image Registry)
-    - name: Push To GHCR
-      if: github.repository == 'vanilla-os/desktop-image'
+    - name: Generate image name
       run: |
-        docker login ghcr.io -u ${{ env.REGISTRY_USER }} -p ${{ env.REGISTRY_PASSWORD }}
-        docker image push "ghcr.io/vanilla-os/desktop:main"
+        REPO_OWNER_LOWERCASE="$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')"
+        echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
+        echo "IMAGE_NAME=ghcr.io/$REPO_OWNER_LOWERCASE/desktop" >> "$GITHUB_ENV"
+
+    - name: Docker meta
+      id: docker_meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          ${{ env. IMAGE_NAME }}
+        tags: |
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{raw}}
+          type=semver,pattern=v{{major}}
+          type=ref,event=branch
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Package Registry
+      uses: docker/login-action@v3
+      if: ${{ github.event_name == 'push' }}
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and Push the Docker image
+      id: push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: Containerfile
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.docker_meta.outputs.tags }}
+        labels: ${{ steps.docker_meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
diff --git a/.github/workflows/vib-pr.yml b/.github/workflows/vib-pr.yml
diff --git a/recipe.yml b/recipe.yml
@@ -80,8 +80,8 @@ stages:
   - name: flatpak-cve-patch
     type: shell
     commands:
-    - curl -SL http://ftp.us.debian.org/debian/pool/main/f/flatpak/flatpak_1.14.6-1_amd64.deb -o /sources/flatpak_1.14.6-1_amd64.deb # we really need a single file source .-.
-    - dpkg -i /sources/flatpak_1.14.6-1_amd64.deb
+    - curl -SL http://ftp.us.debian.org/debian/pool/main/f/flatpak/flatpak_1.14.8-1_amd64.deb -o /sources/flatpak_1.14.8-1_amd64.deb # we really need a single file source .-.
+    - dpkg -i /sources/flatpak_1.14.8-1_amd64.deb
     - apt -y install -f
 
   - name: firstsetup-default-session