Always push

This commit is contained in:
Greyscale 2024-02-20 20:35:08 +01:00
parent 95b7de9c8b
commit 0f88405a10
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
16 changed files with 16 additions and 101 deletions

View file

@ -18,9 +18,6 @@ concurrency:
group: bouncer-${{ github.head_ref || github.run_id }} group: bouncer-${{ github.head_ref || github.run_id }}
cancel-in-progress: true cancel-in-progress: true
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
bouncer-build: bouncer-build:
name: Build Bouncer name: Build Bouncer
@ -59,14 +56,12 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io

View file

@ -13,9 +13,6 @@ on:
- "laravel/**" - "laravel/**"
- ".github/workflows/laravel.yml" - ".github/workflows/laravel.yml"
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
laravel-build: laravel-build:
name: "Build: Laravel Container" name: "Build: Laravel Container"
@ -38,14 +35,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -58,7 +53,7 @@ jobs:
context: laravel context: laravel
platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
build-args: | build-args: |
PHP_VERSION=${{ matrix.version }} PHP_VERSION=${{ matrix.version }}
tags: | tags: |
@ -76,14 +71,12 @@ jobs:
needs: [laravel-build] needs: [laravel-build]
steps: steps:
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io

View file

@ -14,9 +14,6 @@ on:
- mariadb/** - mariadb/**
- .github/workflows/mariadb.yml - .github/workflows/mariadb.yml
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
mariadb-build: mariadb-build:
name: "Build" name: "Build"
@ -45,14 +42,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -65,7 +60,7 @@ jobs:
context: mariadb context: mariadb
platforms: ${{ env.ACT && 'linux/amd64' || 'linux/amd64,linux/arm64' }} platforms: ${{ env.ACT && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
pull: true pull: true
push: ${{ env.should_push }} push: true
tags: | tags: |
benzine/mariadb:${{ matrix.version }} benzine/mariadb:${{ matrix.version }}
ghcr.io/benzine-framework/mariadb:${{ matrix.version }} ghcr.io/benzine-framework/mariadb:${{ matrix.version }}

View file

@ -70,14 +70,12 @@ jobs:
- uses: docker/setup-buildx-action@v3 - uses: docker/setup-buildx-action@v3
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -151,14 +149,12 @@ jobs:
- uses: docker/setup-buildx-action@v3 - uses: docker/setup-buildx-action@v3
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -219,14 +215,12 @@ jobs:
- "ghcr.io/benzine-framework/marshall" - "ghcr.io/benzine-framework/marshall"
steps: steps:
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io

View file

@ -14,9 +14,6 @@ on:
- mitm-proxy/** - mitm-proxy/**
- .github/workflows/mitm-proxy.yml - .github/workflows/mitm-proxy.yml
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
mitmproxy-build: mitmproxy-build:
name: "MITM proxy with Healthchecks" name: "MITM proxy with Healthchecks"
@ -74,14 +71,12 @@ jobs:
mitm-proxy mitm-proxy
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -100,9 +95,9 @@ jobs:
BUILD_DATE=${{ github.event.repository.pushed_at }} BUILD_DATE=${{ github.event.repository.pushed_at }}
platforms: ${{ (!env.ACT && !(startsWith('6.',matrix.mitmproxy) || startsWith('5.', matrix.mitmproxy))) && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ (!env.ACT && !(startsWith('6.',matrix.mitmproxy) || startsWith('5.', matrix.mitmproxy))) && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
pull: true pull: true
push: ${{ env.should_push }} push: true
tags: | tags: |
${{ format('benzine/mitmproxy:{0}', matrix.mitmproxy) }} ${{ format('benzine/mitmproxy:{0}', matrix.mitmproxy) }}
${{ env.should_push && format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }} ${{ format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }}
cache-from: ${{ !env.ACT && 'type=gha' || '' }} cache-from: ${{ !env.ACT && 'type=gha' || '' }}
cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }} cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}

View file

@ -8,9 +8,6 @@ on:
workflow_call: workflow_call:
workflow_dispatch: workflow_dispatch:
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
mqtt-build: mqtt-build:
name: "Build" name: "Build"
@ -38,14 +35,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -58,7 +53,7 @@ jobs:
context: mqtt context: mqtt
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
gone/mqtt:${{ matrix.version }}${{ matrix.openssl }} gone/mqtt:${{ matrix.version }}${{ matrix.openssl }}
benzine/mqtt:${{ matrix.version }}${{ matrix.openssl }} benzine/mqtt:${{ matrix.version }}${{ matrix.openssl }}

View file

@ -12,9 +12,6 @@ concurrency:
group: mysql-proxy-${{ github.head_ref || github.run_id }} group: mysql-proxy-${{ github.head_ref || github.run_id }}
cancel-in-progress: true cancel-in-progress: true
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
mysql-proxy-build: mysql-proxy-build:
name: "Build" name: "Build"
@ -30,14 +27,12 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -57,7 +52,7 @@ jobs:
target: mysql-proxy target: mysql-proxy
platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
${{ !env.ACT && 'benzine/mysql-proxy:latest' || '' }} ${{ !env.ACT && 'benzine/mysql-proxy:latest' || '' }}
${{ !env.ACT && 'ghcr.io/benzine-framework/mysql-proxy:latest' || 'ghcr.io/benzine-framework/mysql-proxy:devel' }} ${{ !env.ACT && 'ghcr.io/benzine-framework/mysql-proxy:latest' || 'ghcr.io/benzine-framework/mysql-proxy:devel' }}

View file

@ -12,9 +12,6 @@ concurrency:
group: nodejs-${{ github.head_ref || github.run_id }} group: nodejs-${{ github.head_ref || github.run_id }}
cancel-in-progress: true cancel-in-progress: true
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
node-flavours-build: node-flavours-build:
name: "Build" name: "Build"
@ -44,14 +41,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -66,7 +61,7 @@ jobs:
target: nodejs target: nodejs
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
gone/node:${{ matrix.node }}-${{ matrix.yarn }} gone/node:${{ matrix.node }}-${{ matrix.yarn }}
benzine/node:${{ matrix.node }}-${{ matrix.yarn }} benzine/node:${{ matrix.node }}-${{ matrix.yarn }}

View file

@ -14,9 +14,6 @@ on:
- "octoprint/**" - "octoprint/**"
- ".github/workflows/octoprint.yml" - ".github/workflows/octoprint.yml"
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
octoprint-build: octoprint-build:
name: "Bake Octoprint" name: "Bake Octoprint"
@ -37,7 +34,7 @@ jobs:
target: octoprint target: octoprint
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: matthewbaggett/octoprint:latest tags: matthewbaggett/octoprint:latest
octoprint-mjpg-build: octoprint-mjpg-build:
@ -48,14 +45,12 @@ jobs:
- uses: docker/setup-qemu-action@v3 - uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -68,5 +63,5 @@ jobs:
target: octoprint-mjpg-streamer target: octoprint-mjpg-streamer
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: matthewbaggett/octoprint:mjpg-streamer-yu12 tags: matthewbaggett/octoprint:mjpg-streamer-yu12

View file

@ -14,9 +14,6 @@ permissions:
contents: read contents: read
packages: write packages: write
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
perl-build: perl-build:
name: "Build Perl" name: "Build Perl"
@ -39,14 +36,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io

View file

@ -8,9 +8,6 @@ permissions:
contents: read contents: read
packages: write packages: write
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
php-flavours-build: php-flavours-build:
name: "Build PHP Flavours" name: "Build PHP Flavours"
@ -74,14 +71,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -99,7 +94,7 @@ jobs:
target: php-${{ matrix.variant }} target: php-${{ matrix.variant }}
platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }} ghcr.io/benzine-framework/php:${{ matrix.variant }}-${{ matrix.version }}
gone/php:${{ matrix.variant }}-${{ matrix.version }} gone/php:${{ matrix.variant }}-${{ matrix.version }}
@ -141,14 +136,12 @@ jobs:
- "ghcr.io/benzine-framework/php" - "ghcr.io/benzine-framework/php"
steps: steps:
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io

View file

@ -14,9 +14,6 @@ on:
- postgres/** - postgres/**
- .github/workflows/postgres.yml - .github/workflows/postgres.yml
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
postgres-build: postgres-build:
name: "Build" name: "Build"
@ -71,14 +68,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -105,7 +100,7 @@ jobs:
context: postgres context: postgres
platforms: ${{ env.ACT && 'linux/amd64' || 'linux/amd64,linux/arm64' }} platforms: ${{ env.ACT && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
pull: true pull: true
push: ${{ env.should_push }} push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
annotations: ${{ steps.meta.outputs.annotations }} annotations: ${{ steps.meta.outputs.annotations }}

View file

@ -8,9 +8,6 @@ on:
workflow_call: workflow_call:
workflow_dispatch: workflow_dispatch:
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
redis-build: redis-build:
name: "Build" name: "Build"
@ -51,14 +48,12 @@ jobs:
redis redis
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -75,9 +70,9 @@ jobs:
HEALTH_INTERVAL=10s HEALTH_INTERVAL=10s
platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
${{ format('ghcr.io/benzine-framework/redis:{0}', matrix.redis) }} ${{ format('ghcr.io/benzine-framework/redis:{0}', matrix.redis) }}
${{ env.should_push && format('benzine/redis:{0}',matrix.redis) || '' }} ${{ format('benzine/redis:{0}',matrix.redis) || '' }}
cache-from: ${{ !env.ACT && 'type=gha' || '' }} cache-from: ${{ !env.ACT && 'type=gha' || '' }}
cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }} cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}

View file

@ -18,9 +18,6 @@ concurrency:
group: ${{ github.workflow }}-s3db-${{ github.head_ref || github.run_id }} group: ${{ github.workflow }}-s3db-${{ github.head_ref || github.run_id }}
cancel-in-progress: true cancel-in-progress: true
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
s3db-build: s3db-build:
name: Build S3DB name: Build S3DB
@ -59,14 +56,12 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -98,7 +93,7 @@ jobs:
target: ${{ matrix.database }} target: ${{ matrix.database }}
file: s3db/Dockerfile.${{ matrix.database }} file: s3db/Dockerfile.${{ matrix.database }}
platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
push: ${{ env.should_push }} push: true
tags: | tags: |
ghcr.io/benzine-framework/s3db:${{ matrix.database }}-${{ matrix.version }} ghcr.io/benzine-framework/s3db:${{ matrix.database }}-${{ matrix.version }}
benzine/s3db:${{ matrix.database }}-${{ matrix.version }} benzine/s3db:${{ matrix.database }}-${{ matrix.version }}

View file

@ -8,9 +8,6 @@ on:
workflow_call: workflow_call:
workflow_dispatch: workflow_dispatch:
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
swarm-monitor-build: swarm-monitor-build:
name: Build Swarm Monitor name: Build Swarm Monitor
@ -39,14 +36,12 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -78,7 +73,7 @@ jobs:
target: swarm-${{ matrix.component }} target: swarm-${{ matrix.component }}
platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: ${{ !env.ACT && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
matthewbaggett/swarm-agent:${{ matrix.component }} matthewbaggett/swarm-agent:${{ matrix.component }}
cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=/tmp' }} cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=/tmp' }}

View file

@ -14,9 +14,6 @@ on:
- "wordpress/**" - "wordpress/**"
- ".github/workflows/wordpress.yml" - ".github/workflows/wordpress.yml"
env:
should_push: ${{ github.ref == 'refs/heads/main' }}
jobs: jobs:
wordpress-build: wordpress-build:
name: "Bake Wordpress Container" name: "Bake Wordpress Container"
@ -29,14 +26,12 @@ jobs:
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
- name: "Setup: Login to Docker Hub" - name: "Setup: Login to Docker Hub"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: matthewbaggett username: matthewbaggett
password: ${{ secrets.DOCKER_HUB_PASSWORD }} password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: "Setup: Login to GHCR" - name: "Setup: Login to GHCR"
if: ${{ env.should_push }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
@ -49,7 +44,7 @@ jobs:
context: wordpress context: wordpress
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
pull: true pull: true
push: ${{ env.should_push && !env.ACT }} push: true
tags: | tags: |
matthewbaggett/wordpress matthewbaggett/wordpress
build-contexts: | build-contexts: |