Fix Dockerfile deprecations

gocd-contrib · Jul 3, 2024 · 897ffb0 · 897ffb0
1 parent 4c545d2
commit 897ffb0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/centos.Dockerfile b/centos.Dockerfile
@@ -1,5 +1,5 @@
 FROM quay.io/centos/centos:stream9
-MAINTAINER GoCD Team <[email protected]>
+LABEL org.opencontainers.image.authors="GoCD Team <[email protected]>"
 
 ARG BUILDARCH
 ARG TARGETARCH
@@ -13,8 +13,8 @@ ENTRYPOINT ["/usr/bin/tini", "--"]
 USER go
 
 # force encoding
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 CMD ["/bin/bash", "-lc", "/go/go-agent"]
diff --git a/dind.Dockerfile b/dind.Dockerfile
@@ -1,4 +1,5 @@
 FROM gocd/gocd-agent-docker-dind:v24.2.0
+LABEL org.opencontainers.image.authors="GoCD Team <[email protected]>"
 
 USER root
 RUN apk upgrade --no-cache && \

diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:24.04
-MAINTAINER GoCD Team <[email protected]>
+LABEL org.opencontainers.image.authors="GoCD Team <[email protected]>"
 
 COPY provision /usr/local/src/provision/
 
@@ -10,8 +10,8 @@ ENTRYPOINT ["/usr/bin/tini", "--"]
 USER go
 
 # force encoding
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 CMD ["/bin/bash", "-lc", "/go/go-agent"]
diff --git a/windowsservercore.Dockerfile b/windowsservercore.Dockerfile
@@ -1,4 +1,5 @@
 FROM mcr.microsoft.com/windows/servercore:ltsc2022
+LABEL org.opencontainers.image.authors="GoCD Team <[email protected]>"
 
 # Shamelessly nabbed from https://github.com/gantrior/docker-chrome-windows
 #