diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-27 20:42:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-27 20:42:54 +0100 |
| commit | 1d25b432515d2bf1b05cfb248be6bf5fac88509f (patch) | |
| tree | d46fdfc79044559c8922ee0ad082f985add0003c | |
| parent | 65d5a9cea20590b96b46d7f86173851570199aa7 (diff) | |
| parent | 4cc8a5ee6b684c5e15f54f346adb7e11fe77d3ec (diff) | |
| download | vyos-build-1d25b432515d2bf1b05cfb248be6bf5fac88509f.tar.gz vyos-build-1d25b432515d2bf1b05cfb248be6bf5fac88509f.zip | |
Merge pull request #512 from vyos/mergify/bp/sagitta/pr-506
docker: T4440: add OCI container labels (backport #506)
| -rw-r--r-- | docker-vyos/Dockerfile | 13 | ||||
| -rw-r--r-- | docker/Dockerfile | 11 |
2 files changed, 22 insertions, 2 deletions
diff --git a/docker-vyos/Dockerfile b/docker-vyos/Dockerfile index ef7621c6..95fe6ee3 100644 --- a/docker-vyos/Dockerfile +++ b/docker-vyos/Dockerfile @@ -84,4 +84,15 @@ LABEL maintainer="support@vyos.io" \ description="VyOS for Docker" \ vendor="Sentrium S.L." \ version=${VYOS_VERSION} \ - io.vyos.build-date=${BUILD_DATE} + io.vyos.build-date=${BUILD_DATE} \ + org.opencontainers.image.authors="support@vyos.io" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.version=${VYOS_VERSION} \ + org.opencontainers.image.url="https://github.com/vyos/vyos-build" \ + org.opencontainers.image.documentation="https://docs.vyos.io/en/latest/contributing/build-vyos.html" \ + org.opencontainers.image.source="https://github.com/vyos/vyos-build" \ + org.opencontainers.image.vendor="Sentrium S.L." \ + org.opencontainers.image.licenses="GNU" \ + org.opencontainers.image.title="vyos-build" \ + org.opencontainers.image.description="VyOS for Docker" \ + org.opencontainers.image.base.name="docker.io/debian/debian:${DEBIAN_VERSION}-slim" diff --git a/docker/Dockerfile b/docker/Dockerfile index 62601912..b6006400 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,7 +40,16 @@ RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-rele # On some versions of docker the emulation framework is not installed by default and # you need to install qemu, qemu-user-static and register qemu inside docker manually using: # `docker run --rm --privileged multiarch/qemu-user-static:register --reset` -LABEL authors="VyOS Maintainers <maintainers@vyos.io>" +LABEL authors="VyOS Maintainers <maintainers@vyos.io>" \ + org.opencontainers.image.authors="VyOS Maintainers <maintainers@vyos.io>" \ + org.opencontainers.image.url="https://github.com/vyos/vyos-build" \ + org.opencontainers.image.documentation="https://docs.vyos.io/en/latest/contributing/build-vyos.html" \ + org.opencontainers.image.source="https://github.com/vyos/vyos-build" \ + org.opencontainers.image.vendor="Sentrium S.L." \ + org.opencontainers.image.licenses="GNU" \ + org.opencontainers.image.title="vyos-build" \ + org.opencontainers.image.description="Container to build VyOS ISO" \ + org.opencontainers.image.base.name="docker.io/debian/debian:bookworm" ENV DEBIAN_FRONTEND noninteractive RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends |