From 897ffb060596498a800f679b4010f97d3b3d1d6e Mon Sep 17 00:00:00 2001
From: Chad Wilson <chadw@thoughtworks.com>
Date: Wed, 3 Jul 2024 13:05:32 +0800
Subject: [PATCH] Fix Dockerfile deprecations

---
 centos.Dockerfile            | 8 ++++----
 dind.Dockerfile              | 1 +
 ubuntu.Dockerfile            | 8 ++++----
 windowsservercore.Dockerfile | 1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/centos.Dockerfile b/centos.Dockerfile
index 24e7db6..b3580d7 100644
--- a/centos.Dockerfile
+++ b/centos.Dockerfile
@@ -1,5 +1,5 @@
 FROM quay.io/centos/centos:stream9
-MAINTAINER GoCD Team <go-cd-dev@googlegroups.com>
+LABEL org.opencontainers.image.authors="GoCD Team <go-cd-dev@googlegroups.com>"
 
 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
index 1eadee4..1afbaab 100644
--- 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 <go-cd-dev@googlegroups.com>"
 
 USER root
 RUN apk upgrade --no-cache && \
diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile
index 0564131..4ca6010 100644
--- a/ubuntu.Dockerfile
+++ b/ubuntu.Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:24.04
-MAINTAINER GoCD Team <go-cd-dev@googlegroups.com>
+LABEL org.opencontainers.image.authors="GoCD Team <go-cd-dev@googlegroups.com>"
 
 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
index 09ef39d..28d5042 100644
--- a/windowsservercore.Dockerfile
+++ b/windowsservercore.Dockerfile
@@ -1,4 +1,5 @@
 FROM mcr.microsoft.com/windows/servercore:ltsc2022
+LABEL org.opencontainers.image.authors="GoCD Team <go-cd-dev@googlegroups.com>"
 
 # Shamelessly nabbed from https://github.com/gantrior/docker-chrome-windows
 #