Skip to content

Commit 62c1dc7

Browse files
authored
Merge pull request #523 from danielhass/non-root-latest
#411 - Added latest-nonroot image tag
2 parents f48db71 + 5451a07 commit 62c1dc7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/dockerimage.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ permissions:
1414
jobs:
1515

1616
# Build default priviliged container image version
17-
# We make it need the other jobs, so this comes last and becomes the "latest"
1817
docker-root:
1918
runs-on: ubuntu-latest
20-
needs: [docker-nonroot]
2119
steps:
2220
- name: Check out the repo
2321
uses: actions/checkout@v3
@@ -77,7 +75,12 @@ jobs:
7775
uses: docker/metadata-action@v4
7876
with:
7977
images: ghcr.io/${{ github.repository }}
80-
tags: type=ref,event=tag,suffix=-nonroot
78+
# no "latest" tag for non-root variant
79+
flavor: latest=false
80+
tags: |
81+
type=ref,event=tag,suffix=-nonroot
82+
# set latest-nonroot tag for default branch
83+
type=raw,value=latest-nonroot
8184
8285
- name: Build and push Docker image
8386
uses: docker/build-push-action@v4

deploy/docker-compose.nonroot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
version: "3"
1111
services:
1212
timetagger:
13-
image: ghcr.io/almarklein/timetagger:v23.9.2-nonroot
13+
image: ghcr.io/almarklein/timetagger:latest-nonroot
1414
ports:
1515
- "80:80"
1616
volumes:

0 commit comments

Comments
 (0)