From ca78e79076bbd46e82bd539ddf635c87aab778b7 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Thu, 24 Mar 2022 22:47:04 +0000 Subject: [PATCH] Move our labeling of the image to the end MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is so we don't recache all the layers on a version number change That would be silly😅 --- Dockerfile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index f293c2e2..c72d93ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,6 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND="noninteractive" -ARG BUILD_DATE -ARG BUILD_REF -ARG CRAFTY_VER - -# Add meta labels -LABEL \ - maintainer="Zedifus " \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${CRAFTY_VER} \ - org.opencontainers.image.title="Crafty Controller" \ - org.opencontainers.image.description="A Game Server Control Panel / Launcher" \ - org.opencontainers.image.url="https://craftycontrol.com/" \ - org.opencontainers.image.documentation="https://wiki.craftycontrol.com/" \ - org.opencontainers.image.source="https://gitlab.com/crafty-controller/crafty-commander" \ - org.opencontainers.image.vendor="Arcadia Technology, LLC." \ - org.opencontainers.image.licenses="" # Security Patch for CVE-2021-44228 ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true @@ -71,3 +54,20 @@ EXPOSE 25500-25600 # Start Crafty Commander through wrapper ENTRYPOINT ["/commander/docker_launcher.sh"] CMD ["-v", "-d", "-i"] + +# Add meta labels +ARG BUILD_DATE +ARG BUILD_REF +ARG CRAFTY_VER +LABEL \ + maintainer="Zedifus " \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${CRAFTY_VER} \ + org.opencontainers.image.title="Crafty Controller" \ + org.opencontainers.image.description="A Game Server Control Panel / Launcher" \ + org.opencontainers.image.url="https://craftycontrol.com/" \ + org.opencontainers.image.documentation="https://wiki.craftycontrol.com/" \ + org.opencontainers.image.source="https://gitlab.com/crafty-controller/crafty-commander" \ + org.opencontainers.image.vendor="Arcadia Technology, LLC." \ + org.opencontainers.image.licenses=""