schtobia/buildimage
1
0
Fork 0
Code Issues Pull requests Packages 1 Activity

feat: don't require build-args for the labels, just write the directly via --label

Browse source
This commit is contained in:
Tobias Schmidl 2023-09-22 08:17:49 +02:00
parent af0c32c7ba
commit 84d4b50404
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -5,10 +5,11 @@
DOCKER := docker DOCKER := docker
BUILDER := ${DOCKER} buildx BUILDER := ${DOCKER} buildx
TAG := git.schmidl.dev/schtobia/buildimage TAG := git.schmidl.dev/schtobia/buildimage
URL:= https://${TAG}
VERSION = $(shell git describe --tags --always --dirty) VERSION = $(shell git describe --tags --always --dirty)
build: dockerfile build: dockerfile
@${BUILDER} build --build-arg=GIT_COMMIT=$(shell git describe --always) --build-arg=VERSION=${VERSION} --build-arg=TIMESTAMP="$(shell date -u -Iseconds)" -t ${TAG} -t ${TAG}:${VERSION} . @${BUILDER} build --label org.opencontainers.image.revision=$(shell git describe --always) --label org.opencontainers.image.version=${VERSION} --label org.opencontainers.image.created="$(shell date -u -Iseconds)" --label org.opencontainers.image.source=https://${TAG}.git --label org.opencontainers.image.url=https://${TAG} -t ${TAG} -t ${TAG}:${VERSION} .
.PHONY: publish .PHONY: publish
publish: build publish: build

13
dockerfile
View file

@ -5,19 +5,14 @@
FROM debian:bullseye-slim FROM debian:bullseye-slim
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG GIT_COMMIT
ARG VERSION
ARG TIMESTAMP
LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later" \ LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later" \
org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \ org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \
org.opencontainers.image.title=buildimage \ org.opencontainers.image.title=buildimage
org.opencontainers.image.source="https://git.schmidl.dev/schtobia/buildimage" \
org.opencontainers.image.url="https://git.schmidl.dev/schtobia/buildimage"
# editorconfig-checker-disable # editorconfig-checker-disable
RUN apt update \ RUN apt update \
&& apt install --assume-yes --no-install-recommends \ && apt install --assume-yes --no-install-recommends --quiet \
build-essential \ build-essential \
dpkg-sig \ dpkg-sig \
git \ git \
@ -30,7 +25,3 @@ RUN useradd -rm builder
USER builder USER builder
WORKDIR /workdir WORKDIR /workdir
LABEL org.opencontainers.image.revision=${GIT_COMMIT}
LABEL org.opencontainers.image.version=${VERSION}
LABEL org.opencontainers.image.created=${TIMESTAMP}