From 45d491245263e3880f4a27313dee40efa8ac0966 Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 26 Aug 2023 04:01:18 +0100 Subject: [PATCH] Hrm --- .gitea/workflows/build-nginx.yaml | 26 ------------------- .gitea/workflows/build-php-cli.yaml | 26 ------------------- .gitea/workflows/build-php-fpm.yaml | 26 ------------------- .../{build-motioneye.yaml => build.yaml} | 6 +++++ 4 files changed, 6 insertions(+), 78 deletions(-) delete mode 100644 .gitea/workflows/build-nginx.yaml delete mode 100644 .gitea/workflows/build-php-cli.yaml delete mode 100644 .gitea/workflows/build-php-fpm.yaml rename .gitea/workflows/{build-motioneye.yaml => build.yaml} (64%) diff --git a/.gitea/workflows/build-nginx.yaml b/.gitea/workflows/build-nginx.yaml deleted file mode 100644 index 84edf98..0000000 --- a/.gitea/workflows/build-nginx.yaml +++ /dev/null @@ -1,26 +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: Buildx Container - run: docker buildx create --name buildx --driver=docker-container - - name: Build nginx-web - run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./nginx-web -t git.tgj.services/thatguyjack/nginx-web: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-php-cli.yaml b/.gitea/workflows/build-php-cli.yaml deleted file mode 100644 index 02c0a85..0000000 --- a/.gitea/workflows/build-php-cli.yaml +++ /dev/null @@ -1,26 +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: Buildx Container - run: docker buildx create --name buildx --driver=docker-container - - name: Build php-CLI - run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./php-cli/ -t git.tgj.services/thatguyjack/php-cli: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-php-fpm.yaml b/.gitea/workflows/build-php-fpm.yaml deleted file mode 100644 index 6464a04..0000000 --- a/.gitea/workflows/build-php-fpm.yaml +++ /dev/null @@ -1,26 +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: Buildx Container - run: docker buildx create --name buildx --driver=docker-container - - name: Build php-FPM - run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm: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-motioneye.yaml b/.gitea/workflows/build.yaml similarity index 64% rename from .gitea/workflows/build-motioneye.yaml rename to .gitea/workflows/build.yaml index 6a65e1c..56297d9 100644 --- a/.gitea/workflows/build-motioneye.yaml +++ b/.gitea/workflows/build.yaml @@ -16,8 +16,14 @@ jobs: run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login git.tgj.services -u thatguyjack --password-stdin - name: Buildx Container run: docker buildx create --name buildx --driver=docker-container + - name: Build nginx-web + run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./nginx-web -t git.tgj.services/thatguyjack/nginx-web:latest --push + - name: Build php-CLI + run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./php-cli/ -t git.tgj.services/thatguyjack/php-cli:latest --push - name: Build motioneye run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./motioneye -t git.tgj.services/thatguyjack/motioneye:latest --push + - name: Build php-FPM + run: docker buildx build --builder=buildx --platform=linux/amd64,linux/arm64,linux/arm/v7 ./php-fpm/ -t git.tgj.services/thatguyjack/php-fpm:latest --push # - name: Push # run: | # docker push git.tgj.services/thatguyjack/php-fpm:latest