Skip to content

Commit 0ab5e2d

Browse files
authored
Merge branch '3.2' into ci/docker-prefer-dist-local
2 parents ed02850 + 6aa1c58 commit 0ab5e2d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/docker-3.2.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
runs-on: ubuntu-24.04
2121

2222
steps:
23+
- name: lowercase the repository name
24+
run: echo "REPO=${GITHUB_REPOSITORY@L}" >> "${GITHUB_ENV}"
25+
2326
- name: Source checkout
2427
uses: actions/checkout@v4
2528

@@ -35,11 +38,11 @@ jobs:
3538
id: docker_meta
3639
uses: docker/metadata-action@v5
3740
with:
38-
images: ${{ github.repository }}
41+
images: ${{ env.REPO }}
3942
labels: |
4043
org.opencontainers.image.version=${{ env.GIT_BRANCH }}
4144
org.opencontainers.image.revision=${{ github.sha }}
42-
org.opencontainers.image.title=${{ github.repository }}
45+
org.opencontainers.image.title=${{ env.REPO }}
4346
4447
- name: GitHub login
4548
if: ${{ github.event_name != 'pull_request' }}
@@ -60,5 +63,5 @@ jobs:
6063
cache-to: type=gha, scope=${{ github.workflow }}
6164
labels: ${{ steps.docker_meta.outputs.labels }}
6265
tags: |
63-
ghcr.io/${{ github.repository }}:${{ env.GIT_BRANCH }}
64-
ghcr.io/${{ github.repository }}:latest
66+
ghcr.io/${{ env.REPO }}:${{ env.GIT_BRANCH }}
67+
ghcr.io/${{ env.REPO }}:latest

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- '**.html'
1313
- 'LICENSE'
1414
- 'Dockerfile'
15-
- 'Dockerfile-alpine'
15+
- 'Dockerfile.alpine'
1616

1717
permissions:
1818
contents: read

0 commit comments

Comments
 (0)