aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2023-11-14 08:17:34 +0100
committerGitHub <noreply@github.com>2023-11-14 08:17:34 +0100
commit876d0567056fcce09df3ee4c804e3a991c3cb3e7 (patch)
tree4c2ac7f7db0e04dfbc38c8d6ca20a8d98d1202ec /.github
parente988978fa199ccb8e130e1eea344666ab5953681 (diff)
downloadsyncthing-876d0567056fcce09df3ee4c804e3a991c3cb3e7.tar.gz
syncthing-876d0567056fcce09df3ee4c804e3a991c3cb3e7.zip
build: Fixup Docker changes from previous (#9223)
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-infra-dockers.yaml4
-rw-r--r--.github/workflows/build-syncthing.yaml6
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build-infra-dockers.yaml b/.github/workflows/build-infra-dockers.yaml
index 997ecc4e3..b1b2192e4 100644
--- a/.github/workflows/build-infra-dockers.yaml
+++ b/.github/workflows/build-infra-dockers.yaml
@@ -51,5 +51,5 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: syncthing/${{ matrix.pkg }}:latest,syncthing/${{ matrix.pkg }}:${{ github.sha }}
- outputs: |
- annotation.org.opencontainers.image.revision="${{ github.sha }}"
+ labels: |
+ org.opencontainers.image.revision=${{ github.sha }}
diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml
index aced02673..bc036accd 100644
--- a/.github/workflows/build-syncthing.yaml
+++ b/.github/workflows/build-syncthing.yaml
@@ -818,9 +818,9 @@ jobs:
platforms: linux/amd64,linux/arm64,linux/arm/7
push: ${{ env.DOCKER_PUSH == 'true' }}
tags: ${{ env.DOCKER_TAGS }}
- outputs: |
- annotation.org.opencontainers.image.version="${{ env.VERSION }}"
- annotation.org.opencontainers.image.revision="${{ github.sha }}"
+ labels: |
+ org.opencontainers.image.version=${{ env.VERSION }}
+ org.opencontainers.image.revision=${{ github.sha }}
#
# Check for known vulnerabilities in Go dependencies