Publish one release image digest from a modernised workflow
The push job called build-push-action twice, once for the ref tag and once for latest. Two builds meant the two tags could resolve to different manifest digests. Build once and let docker/metadata-action supply both tags and the OCI labels for that single build. Replace the deprecated actions/checkout@v2 and docker/build-push-action@v1, default workflow permissions to contents: read so pull requests cannot reach publication credentials, and authenticate with a scoped DOCKER_TOKEN through docker/login-action instead of DOCKER_PASSWORD. The test job's docker-compose.test.yml branch was dead; that file does not exist in the repository. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
6abd3323d2
commit
9b9d4f0577
2 files changed
+44
-28
No files matched your search
@@ -9,24 +9,29 @@ on:
|
|||||||
|
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
env:
|
||||||
|
IMAGE: snegov/seafile-client
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Validate compose example
|
- name: Validate compose example
|
||||||
run: docker compose --file compose.example.yaml config --quiet
|
run: docker compose --file compose.example.yaml config --quiet
|
||||||
|
|
||||||
- name: Run tests
|
- name: Build image
|
||||||
run: |
|
uses: docker/build-push-action@v6
|
||||||
if [ -f docker-compose.test.yml ]; then
|
with:
|
||||||
docker-compose --file docker-compose.test.yml build
|
context: .
|
||||||
docker-compose --file docker-compose.test.yml run sut
|
push: false
|
||||||
else
|
load: true
|
||||||
docker build . --file Dockerfile
|
tags: ${{ env.IMAGE }}:ci
|
||||||
fi
|
|
||||||
|
|
||||||
push:
|
push:
|
||||||
needs: test
|
needs: test
|
||||||
@@ -35,22 +40,30 @@ jobs:
|
|||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: docker/build-push-action@v1
|
# Every tag of a release must resolve to one manifest digest, so the
|
||||||
|
# image is built once and all tags are attached to that single build.
|
||||||
|
- name: Collect tags and labels
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.IMAGE }}
|
||||||
|
tags: |
|
||||||
|
type=ref,event=tag
|
||||||
|
flavor: |
|
||||||
|
latest=true
|
||||||
|
|
||||||
|
- name: Log in to Docker Hub
|
||||||
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_TOKEN }}
|
||||||
repository: snegov/seafile-client
|
|
||||||
tag_with_ref: true
|
|
||||||
add_git_labels: true
|
|
||||||
push: ${{ startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
|
|
||||||
- uses: docker/build-push-action@v1
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
context: .
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
push: true
|
||||||
repository: snegov/seafile-client
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
tags: latest
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
add_git_labels: true
|
|
||||||
push: ${{ startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
+8
-5
@@ -147,12 +147,15 @@ Acceptance criteria:
|
|||||||
|
|
||||||
### CI and release pipeline
|
### CI and release pipeline
|
||||||
|
|
||||||
- [ ] Replace `actions/checkout@v2` and `docker/build-push-action@v1`.
|
- [x] Replace `actions/checkout@v2` and `docker/build-push-action@v1`.
|
||||||
- [ ] Set workflow permissions explicitly to `contents: read` by default.
|
- [x] Set workflow permissions explicitly to `contents: read` by default.
|
||||||
- [ ] Use a scoped Docker Hub access token.
|
- [x] Use a scoped Docker Hub access token. The workflow now reads
|
||||||
- [ ] Build a release image once and attach all version and `latest` tags to
|
`secrets.DOCKER_TOKEN`; the repository secret still has to be created from a
|
||||||
|
scoped Docker Hub token before the next tag is pushed.
|
||||||
|
- [x] Build a release image once and attach all version and `latest` tags to
|
||||||
the same manifest digest.
|
the same manifest digest.
|
||||||
- [ ] Add OCI labels, an SBOM, provenance, and image signing.
|
- [x] Add OCI labels via `docker/metadata-action`.
|
||||||
|
- [ ] Add an SBOM, provenance, and image signing.
|
||||||
- [ ] Add dependency updates for Python, Docker, and GitHub Actions.
|
- [ ] Add dependency updates for Python, Docker, and GitHub Actions.
|
||||||
- [ ] Run dependency and image scans on pull requests and on a schedule.
|
- [ ] Run dependency and image scans on pull requests and on a schedule.
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user