Skip to content

Commit a11bb9e

Browse files
authored
Improve Docker labels (follow-up to #972) (#1067)
- Update OCI labels using docker/metadata-action + documentation and vendor - Override labels from base image - Update docker/metadata-action version.
1 parent 5ec4c89 commit a11bb9e

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/release.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,34 @@ jobs:
1313

1414
- name: Docker image metadata
1515
id: meta
16-
uses: docker/metadata-action@v5
16+
uses: docker/metadata-action@v6
1717
with:
1818
images: webrecorder/browsertrix-crawler
1919
tags: |
2020
type=semver,pattern={{version}}
2121
2222
- name: Set up QEMU
23-
uses: docker/setup-qemu-action@v3
23+
uses: docker/setup-qemu-action@v4
2424
with:
2525
platforms: arm64
2626

2727
- name: Set up Docker Buildx
2828
uses: docker/setup-buildx-action@v4
29+
2930
- name: Login to DockerHub
3031
uses: docker/login-action@v4
3132
with:
3233
username: ${{ secrets.DOCKER_USERNAME }}
3334
password: ${{ secrets.DOCKER_PASSWORD }}
35+
3436
- name: Build and push
3537
id: docker_build
3638
uses: docker/build-push-action@v7
3739
with:
3840
context: .
3941
push: true
4042
tags: ${{ steps.meta.outputs.tags }}
43+
labels: ${{ steps.meta.outputs.labels }}
4144
platforms: "linux/amd64,linux/arm64"
4245
build-args: |
4346
MINIMIZE_IMAGE_SIZE=1

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ ARG BROWSER_IMAGE_BASE=webrecorder/browsertrix-browser-base:brave-${BROWSER_VERS
44
FROM ${BROWSER_IMAGE_BASE}
55

66
LABEL org.opencontainers.image.vendor="Webrecorder <https://webrecorder.net/>"
7-
LABEL org.opencontainers.image.source="https://github.com/webrecorder/browsertrix-crawler"
87
LABEL org.opencontainers.image.documentation="https://crawler.docs.browsertrix.com/"
9-
LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
108

119
# set to 1 to minimize size for prod, but longer build time, otherwise faster build and rebuild but larger image
1210
ARG MINIMIZE_IMAGE_SIZE=0

0 commit comments

Comments
 (0)