From db4c441f677ec112e41c6aced640771b87959f3d Mon Sep 17 00:00:00 2001
From: Jenny Danzmayr <mail@evilscientress.de>
Date: Sun, 12 Nov 2023 19:06:01 +0100
Subject: [PATCH] added opencontainers.org labels to docker containers

---
 docker/Dockerfile            | 12 +++++++++++-
 docker/tileserver.dockerfile | 12 +++++++++++-
 renovate.json                |  3 ++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f905f06a..b8b7986d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,16 @@
 # syntax=docker/dockerfile:1.4
-FROM ubuntu:lunar-20231004@sha256:51e70689b125fcc2e800f5efb7ba465dee85ede9da9c268ff5599053c7e52b77 as base
+ARG BASE_IMAGE_NAME=ubuntu:lunar-20231004
+ARG BASE_IMAGE_DIGEST=sha256:51e70689b125fcc2e800f5efb7ba465dee85ede9da9c268ff5599053c7e52b77
 ARG TARGETARCH
+
+FROM ${BASE_IMAGE_NAME}@${BASE_IMAGE_DIGEST} as base
+
+LABEL org.opencontainers.image.base.name="docker.io/library/$BASE_IMAGE_NAME" \
+      org.opencontainers.image.base.digest="$BASE_IMAGE_DIGEST" \
+      org.opencontainers.image.source="https://github.com/c3nav/c3nav" \
+      org.opencontainers.image.url="https://c3nav.de" \
+      org.opencontainers.image.authors="c3nav team"
+
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN --mount=type=cache,target=/var/cache/apt,id=apt_$TARGETARCH --mount=type=tmpfs,target=/var/lib/apt/lists \
diff --git a/docker/tileserver.dockerfile b/docker/tileserver.dockerfile
index 67369704..e28edf5d 100644
--- a/docker/tileserver.dockerfile
+++ b/docker/tileserver.dockerfile
@@ -1,6 +1,16 @@
 # syntax=docker/dockerfile:1.4
-FROM ubuntu:lunar-20231004@sha256:51e70689b125fcc2e800f5efb7ba465dee85ede9da9c268ff5599053c7e52b77 as base
+ARG BASE_IMAGE_NAME=ubuntu:lunar-20231004
+ARG BASE_IMAGE_DIGEST=sha256:51e70689b125fcc2e800f5efb7ba465dee85ede9da9c268ff5599053c7e52b77
 ARG TARGETARCH
+
+FROM ${BASE_IMAGE_NAME}@${BASE_IMAGE_DIGEST} as base
+
+LABEL org.opencontainers.image.base.name="docker.io/library/$BASE_IMAGE_NAME" \
+      org.opencontainers.image.base.digest="$BASE_IMAGE_DIGEST" \
+      org.opencontainers.image.source="https://github.com/c3nav/c3nav" \
+      org.opencontainers.image.url="https://c3nav.de" \
+      org.opencontainers.image.authors="c3nav team"
+
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN --mount=type=cache,target=/var/cache/apt,id=apt_$TARGETARCH --mount=type=tmpfs,target=/var/lib/apt/lists \
diff --git a/renovate.json b/renovate.json
index 3a1baf2f..761691a9 100644
--- a/renovate.json
+++ b/renovate.json
@@ -32,7 +32,8 @@
       "fileMatch": ["(^|/)[\\w-.]*[Dd]ockerfile$"],
       "matchStringsStrategy": "any",
       "matchStrings": [
-        "ARG BUILD_FROM=(?<depName>.*?):(?<currentValue>.*?)\\s+"
+        "ARG BUILD_FROM=(?<depName>.*?):(?<currentValue>.*?)\\s+",
+        "ARG BASE_IMAGE_NAME=(?<depName>.*?):(?<currentVersion>.*?)\\s+(ARG )?BASE_IMAGE_DIGEST=(?<currentDigest>.*?)\\s"
       ],
       "datasourceTemplate": "docker"
     },