From 406a7259e1f68d08a2327817a74fe0ef27a4f9b7 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Tue, 20 Feb 2024 20:17:01 +0100
Subject: [PATCH] Secrets.

---
 .github/workflows/laravel.yml   | 36 +++++++++++++++++++++++++++------
 .github/workflows/octoprint.yml | 17 ++++++++++++----
 .github/workflows/perl.yml      |  3 +--
 .github/workflows/wordpress.yml | 19 ++++++++++++++---
 4 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index b9bd8a6..c11138f 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -6,6 +6,12 @@ permissions:
 on:
   workflow_call:
   workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "laravel/**"
+      - ".github/workflows/laravel.yml"
 
 env:
   should_push: ${{ github.ref == 'refs/heads/main' }}
@@ -31,12 +37,21 @@ jobs:
 
       - uses: docker/setup-buildx-action@v2
 
-      - uses: docker/login-action@v3
-        name: Login to Docker Hub
+      - name: "Setup: Login to Docker Hub"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
+      - name: "Setup: Login to GHCR"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
       - uses: docker/build-push-action@v3
         name: Build & Push
         with:
@@ -60,12 +75,21 @@ jobs:
     runs-on: ubuntu-latest
     needs: [laravel-build]
     steps:
-      - uses: docker/login-action@v3
-        name: Login to Docker Hub
+      - name: "Setup: Login to Docker Hub"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
+      - name: "Setup: Login to GHCR"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
       - name: "Retag matthewbaggett/laravel:8.3 to matthewbaggett/laravel:latest"
         if: ${{ !env.ACT }}
         run: |
diff --git a/.github/workflows/octoprint.yml b/.github/workflows/octoprint.yml
index 17f0ee8..15901e9 100644
--- a/.github/workflows/octoprint.yml
+++ b/.github/workflows/octoprint.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: docker/login-action@v3
         name: Login to Docker Hub
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       - uses: docker/build-push-action@v3
         name: Build Octoprint
@@ -41,11 +41,20 @@ jobs:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v2
       - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v3
-        name: Login to Docker Hub
+      - name: "Setup: Login to Docker Hub"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
       - uses: docker/build-push-action@v3
         name: Build Octoprint MJPG Streamer Variant
         with:
diff --git a/.github/workflows/perl.yml b/.github/workflows/perl.yml
index e95691a..a68d91a 100644
--- a/.github/workflows/perl.yml
+++ b/.github/workflows/perl.yml
@@ -62,8 +62,7 @@ jobs:
         with:
           context: perl
           target: release
-          platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
-          pull: true
+          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7
           push: true
           tags: |
             ghcr.io/benzine-framework/perl:${{ matrix.ubuntu }}
diff --git a/.github/workflows/wordpress.yml b/.github/workflows/wordpress.yml
index a2d677d..7ccbc31 100644
--- a/.github/workflows/wordpress.yml
+++ b/.github/workflows/wordpress.yml
@@ -17,13 +17,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
       - uses: docker/setup-qemu-action@v2
+
       - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v3
-        name: Login to Docker Hub
+
+      - name: "Setup: Login to Docker Hub"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: matthewbaggett
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: "Setup: Login to GHCR"
+        if: ${{ env.should_push }}
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: matthewbaggett
+          password: ${{ secrets.GHCR_PASSWORD }}
+
       - uses: docker/build-push-action@v3
         name: Build & Push
         with: