From 2d60ff242d864c7bdf6738b9389a00ab8a23f291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20S=C3=B6lder?= Date: Sat, 17 May 2025 23:47:25 +0200 Subject: [PATCH 1/5] feat: add image.sources and image.licenses to dockerfile, pin tag to latest --- .github/files/multi-platform.Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/files/multi-platform.Dockerfile b/.github/files/multi-platform.Dockerfile index b5eadd8bd..18f24c836 100644 --- a/.github/files/multi-platform.Dockerfile +++ b/.github/files/multi-platform.Dockerfile @@ -1,7 +1,11 @@ -FROM alpine +FROM alpine:latest + ARG TARGETPLATFORM LABEL org.opencontainers.image.description="Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support" +LABEL org.opencontainers.image.source="https://github.com/maplibre/martin" +LABEL org.opencontainers.image.licenses="Apache-2.0 OR MIT" + COPY target_releases/$TARGETPLATFORM/* /usr/local/bin HEALTHCHECK CMD wget --spider http://127.0.0.1:3000/health || exit 1 From e4a31988e541fe0aa08ce5610fb79b266f925327 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 17 May 2025 22:01:55 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/files/multi-platform.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/files/multi-platform.Dockerfile b/.github/files/multi-platform.Dockerfile index 18f24c836..dcf3673db 100644 --- a/.github/files/multi-platform.Dockerfile +++ b/.github/files/multi-platform.Dockerfile @@ -3,7 +3,7 @@ FROM alpine:latest ARG TARGETPLATFORM LABEL org.opencontainers.image.description="Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support" -LABEL org.opencontainers.image.source="https://github.com/maplibre/martin" +LABEL org.opencontainers.image.source="https://github.com/maplibre/martin" LABEL org.opencontainers.image.licenses="Apache-2.0 OR MIT" COPY target_releases/$TARGETPLATFORM/* /usr/local/bin From d62900fa0408bc488af2cee7f465b60115df3ed9 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 18 May 2025 01:21:45 +0200 Subject: [PATCH 3/5] Update .github/files/multi-platform.Dockerfile --- .github/files/multi-platform.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/files/multi-platform.Dockerfile b/.github/files/multi-platform.Dockerfile index dcf3673db..80476db1d 100644 --- a/.github/files/multi-platform.Dockerfile +++ b/.github/files/multi-platform.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.21 ARG TARGETPLATFORM From e5a9aa9d4dfc03929728cf198a3ccd8222b76f8d Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 18 May 2025 01:36:32 +0200 Subject: [PATCH 4/5] add more static metadata --- .github/files/multi-platform.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/files/multi-platform.Dockerfile b/.github/files/multi-platform.Dockerfile index 80476db1d..3dcd1145c 100644 --- a/.github/files/multi-platform.Dockerfile +++ b/.github/files/multi-platform.Dockerfile @@ -5,6 +5,8 @@ ARG TARGETPLATFORM LABEL org.opencontainers.image.description="Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support" LABEL org.opencontainers.image.source="https://github.com/maplibre/martin" LABEL org.opencontainers.image.licenses="Apache-2.0 OR MIT" +LABEL org.opencontainers.image.documentation="https://maplibre.org/martin/" +LABEL org.opencontainers.image.vendor="maplibre" COPY target_releases/$TARGETPLATFORM/* /usr/local/bin From 3ad7c1818af9c1388293c195e41ce871fd553744 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 18 May 2025 01:42:36 +0200 Subject: [PATCH 5/5] add one more label --- .github/files/multi-platform.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/files/multi-platform.Dockerfile b/.github/files/multi-platform.Dockerfile index 3dcd1145c..49729042e 100644 --- a/.github/files/multi-platform.Dockerfile +++ b/.github/files/multi-platform.Dockerfile @@ -7,6 +7,7 @@ LABEL org.opencontainers.image.source="https://github.com/maplibre/martin" LABEL org.opencontainers.image.licenses="Apache-2.0 OR MIT" LABEL org.opencontainers.image.documentation="https://maplibre.org/martin/" LABEL org.opencontainers.image.vendor="maplibre" +LABEL org.opencontainers.image.authors="Yuri Astrakhan, Stepan Kuzmin and MapLibre contributors" COPY target_releases/$TARGETPLATFORM/* /usr/local/bin