Skip to content
Snippets Groups Projects
Unverified Commit f53efd9e authored by David Bauer's avatar David Bauer Committed by GitHub
Browse files

Merge pull request #3022 from blocktrron/docker-forks

actions: improve docker image build-process
parents 7fab4326 7ea311f0
No related branches found
No related tags found
No related merge requests found
...@@ -5,8 +5,10 @@ on: ...@@ -5,8 +5,10 @@ on:
push: push:
branches: branches:
- 'master' - 'master'
- 'v202[0-9].[0-9].x'
tags: tags:
- 'v*' - 'v*'
pull_request:
env: env:
REGISTRY: ghcr.io REGISTRY: ghcr.io
...@@ -21,6 +23,7 @@ jobs: ...@@ -21,6 +23,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Log in to the Container registry - name: Log in to the Container registry
uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6 uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
if: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ github.actor }} username: ${{ github.actor }}
...@@ -34,6 +37,6 @@ jobs: ...@@ -34,6 +37,6 @@ jobs:
uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0 uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
with: with:
context: ./contrib/docker context: ./contrib/docker
push: true push: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment