From da7e24c9c636f9dda06968a8eb4a3bfd56a2b0bb Mon Sep 17 00:00:00 2001
From: Jack <Github@thatguyjack.co.uk>
Date: Sat, 26 Aug 2023 03:39:18 +0100
Subject: [PATCH] test

---
 .gitea/workflows/build-arm.yaml | 30 ------------------------------
 .gitea/workflows/build.yaml     |  8 ++++----
 2 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 .gitea/workflows/build-arm.yaml

diff --git a/.gitea/workflows/build-arm.yaml b/.gitea/workflows/build-arm.yaml
deleted file mode 100644
index 25e51ec..0000000
--- a/.gitea/workflows/build-arm.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Build and push image
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  Build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install
-        run: curl -fsSL get.docker.com | bash
-      - name: Clone
-        run: git clone https://git.tgj.services/thatguyjack/custom-docker-containers.git .
-      - name: Login
-        run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login git.tgj.services -u thatguyjack --password-stdin
-      - name: Build php-FPM
-        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm:latest --push
-      - name: Build php-CLI
-        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./php-cli/ -t git.tgj.services/thatguyjack/php-cli:latest --push
-      - name: Build nginx-web
-        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest --push
-      - name: Build motioneye
-        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./motioneye -t git.tgj.services/thatguyjack/motioneye:latest --push
-#      - name: Push
-#        run: |
-#          docker push git.tgj.services/thatguyjack/php-fpm:latest
-#          docker push git.tgj.services/thatguyjack/php-cli:latest
-#          docker push git.tgj.services/thatguyjack/nginx-web:latest
-#          docker push git.tgj.services/thatguyjack/motioneye:latest
\ No newline at end of file
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 4cc1125..da4e087 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -15,13 +15,13 @@ jobs:
       - name: Login
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login git.tgj.services -u thatguyjack --password-stdin
       - name: Build php-FPM
-        run: docker build ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm:latest
+        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm:latest --push
       - name: Build php-CLI
-        run: docker build ./php-cli/ -t git.tgj.services/thatguyjack/php-cli:latest
+        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./php-cli/ -t git.tgj.services/thatguyjack/php-cli:latest --push
       - name: Build nginx-web
-        run: docker build ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest
+        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest --push
       - name: Build motioneye
-        run: docker build ./motioneye -t git.tgj.services/thatguyjack/motioneye:latest
+        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 ./motioneye -t git.tgj.services/thatguyjack/motioneye:latest --push
       - name: Push
         run: |
           docker push git.tgj.services/thatguyjack/php-fpm:latest