revert back to org workflows for main image

XenitAB · Oct 11, 2024 · 676b0ef · 676b0ef
1 parent 0f5cec2
commit 676b0ef
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 62 deletions.
diff --git a/.github/workflows/tools-container-latest.yaml b/.github/workflows/tools-container-latest.yaml
@@ -1,7 +1,6 @@
 name: Tools Container - Publish Latest
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - main
@@ -15,41 +14,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Stupid, lowercase tag
-      - name: Lowercase tags
-        id: lowercase
-        run: |
-          echo "repository=${GITHUB_REPOSITORY@L}" >> $GITHUB_OUTPUT
-      
-      # Original 
       - name: Build and push container image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
-          cache-from: ghcr.io/${{github.repository}}/tools:latest
+          cache-from: ghcr.io/xenitab/github-actions/tools:latest
           file: docker/Dockerfile
           context: docker
-          tags: ghcr.io/l${{ steps.lowercase.outputs.repository }}/tools:latest
-          push: true
-
-      # Light multiArch image
-      - name: '[LITE] Build and push container image'
-        uses: docker/build-push-action@v6
-        with:
-          cache-from: ghcr.io/${{github.repository}}/tools:lite
-          file: docker/Dockerfile.lite
-          context: docker
-          tags: ghcr.io/l${{ steps.lowercase.outputs.repository }}/tools:lite
-          platforms: linux/amd64,linux/arm64
-          push: true
+          tags: ghcr.io/xenitab/github-actions/tools:latest
+          push: true
diff --git a/.github/workflows/tools-container-pr.yaml b/.github/workflows/tools-container-pr.yaml
@@ -1,7 +1,6 @@
 name: Tools Container - PR Validation
 
 on:
-  workflow_dispatch:
   pull_request:
     paths:
       - 'docker/**'
@@ -12,26 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
-      # Build the container image
       - name: Build container image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
-          cache-from: ghcr.io/${{github.repository}}/tools:latest
+          cache-from: ghcr.io/xenitab/github-actions/tools:latest
           file: docker/Dockerfile
           context: docker
-          push: false
-
-      # Build the LITE multiArch container image
-      - name: '[LITE] Build container image'
-        uses: docker/build-push-action@v6
-        with:
-          cache-from: ghcr.io/${{github.repository}}/tools:lite
-          file: docker/Dockerfile.lite
-          context: docker
-          platforms: linux/amd64,linux/arm64
-          push: false
+          push: false
diff --git a/.github/workflows/tools-container-tag.yaml b/.github/workflows/tools-container-tag.yaml
@@ -1,24 +1,26 @@
 name: Tools Container - Publish Tag
 
 on:
-  workflow_dispatch:
   release:
     types:
       - published
+    paths:
+      - "docker/**"
+      - ".github/**"
 
 jobs:
   publish_latest:
     name: Push tagged container image to GitHub Packages
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -28,23 +30,12 @@ jobs:
         id: get_tag
         run: |
           echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo "repository=${GITHUB_REPOSITORY@L}" >> $GITHUB_OUTPUT
 
       - name: Build and push container image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
-          cache-from: ghcr.io/${{github.repository}}/tools:latest
+          cache-from: ghcr.io/xenitab/github-actions/tools:latest
           file: docker/Dockerfile
           context: docker
-          tags: ghcr.io/${{ steps.get_tag.outputs.repository }}/tools:${{ steps.get_tag.outputs.tag }}
-          push: true
-
-      - name: '[LITE] Build and push container image'
-        uses: docker/build-push-action@v6
-        with:
-          cache-from: ghcr.io/${{github.repository}}/tools:lite
-          file: docker/Dockerfile.lite
-          context: docker
-          tags: ghcr.io/${{ steps.get_tag.outputs.repository }}/tools:lite-${{ steps.get_tag.outputs.tag }}
-          platforms: linux/amd64,linux/arm64
-          push: true
+          tags: ghcr.io/xenitab/github-actions/tools:${{ steps.get_tag.outputs.tag }}
+          push: true