From 809dd570fee335aa189dfa94c29f401c47745e85 Mon Sep 17 00:00:00 2001 From: Jenny Danzmayr Date: Sun, 12 Nov 2023 19:09:38 +0100 Subject: [PATCH] updated order of dockerfile ARGs --- docker/Dockerfile | 3 +-- docker/tileserver.dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b8b7986d..da2f4b78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,9 @@ # 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" \ diff --git a/docker/tileserver.dockerfile b/docker/tileserver.dockerfile index e28edf5d..d1ad64bb 100644 --- a/docker/tileserver.dockerfile +++ b/docker/tileserver.dockerfile @@ -1,10 +1,9 @@ # 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" \