build labels

Author: oofnikj

.dockerignore

@@ -0,0 +1,6 @@
+openwrt.conf
+.env
+*.img.gz
+*.img
+etc/config/*
+!etc/config/*.tpl

.gitignore

@@ -1,5 +1,7 @@
 openwrt.conf
 .env
 *.tar.gz
+*.img
+*.img.gz
 etc/config/*
 !etc/config/*.tpl

.gitlab-ci.yml

@@ -40,8 +40,7 @@ build:
     - cp openwrt.conf.example openwrt.conf
     - sed -i -E "s@(BUILD_TAG=).+@\1$CI_IMAGE@" openwrt.conf
     - wget -qO- $SRC_IMAGE | gzip -d > image.img
-    - source openwrt.conf
-    - export ROOT_PW; export BUILD_TAG; export LOOP_ARGS="=/tmp/dev/loop0"; ./build-rpi.sh
+    - LOOP_ARGS="=/tmp/dev/loop0" ./build-rpi.sh
     - docker tag $CI_IMAGE $CI_IMAGE:$TAG
     - docker push $CI_IMAGE:$TAG
 
@@ -61,6 +60,7 @@ build-rpi4:
   extends: .build-rpi
   variables:
     SRC_IMAGE: https://downloads.openwrt.org/snapshots/targets/bcm27xx/bcm2711/openwrt-bcm27xx-bcm2711-rpi-4-ext4-factory.img.gz
+    VERSION: snapshot
     TAG: rpi4
 
 build-rpi-zero:

Dockerfile

@@ -18,4 +18,10 @@ RUN opkg remove dnsmasq && \
 RUN opkg list-upgradable | awk '{print $1}' | xargs opkg upgrade
 RUN echo "iptables -A POSTROUTING -t mangle -p udp --dport 68 -j CHECKSUM --checksum-fill" >> /etc/firewall.user
 
+ARG ts
+ARG version
+LABEL org.opencontainers.image.created=$ts
+LABEL org.opencontainers.image.version=$version
+LABEL org.opencontainers.image.source=https://github.com/oofnikj/docker-openwrt
+
 CMD [ "/sbin/init" ]

Dockerfile.rpi

@@ -8,5 +8,10 @@ RUN opkg update && \
       iperf3 \
       ip-full
 RUN  opkg list-upgradable | awk '{print $1}' | xargs opkg upgrade || true
+ARG ts
+ARG version
+LABEL org.opencontainers.image.created=$ts
+LABEL org.opencontainers.image.version=$version
+LABEL org.opencontainers.image.source=https://github.com/oofnikj/docker-openwrt
 
 CMD [ "/sbin/init" ]

Makefile

@@ -8,6 +8,8 @@ build:
 	docker build \
 		--build-arg ROOT_PW \
 		--build-arg OPENWRT_SOURCE_VER \
+		--build-arg ts="$(shell date)" \
+		--build-arg version="${OPENWRT_SOURCE_VER}" \
 		-t ${BUILD_TAG} .
 	rm openwrt-${OPENWRT_SOURCE_VER}-x86-64-generic-rootfs.tar.gz
 

build-rpi.sh

@@ -11,6 +11,7 @@
 set -e
 
 IMG=${1:-'image.img'}
+. ./openwrt.conf
 
 check_uid() {
 	if [[ $(id -u) -ne 0 ]]; then
@@ -31,6 +32,8 @@ docker_build() {
 	echo "* building Docker image"
 	docker build \
 		--build-arg ROOT_PW="${ROOT_PW}" \
+		--build-arg ts="$(date)" \
+		--build-arg version="${VERSION:-$OPENWRT_SOURCE_VER}" \
 		-t ${BUILD_TAG} -f Dockerfile.rpi ${tmpdir}
 }