-
Notifications
You must be signed in to change notification settings - Fork 37
Fix Docker build warnings in Dockerfile templates #703
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
|
This pull request does not have a backport label. Could you fix it @Copilot? 🙏
|
…nd FromAsCasing Co-authored-by: v1v <2871786+v1v@users.noreply.github.com>
|
@copilot since the version is now defaulted here, update github/updatecli.d/bump-go-version.sh to change the |
Co-authored-by: v1v <2871786+v1v@users.noreply.github.com>
Updated |
|
@copilot, confirm if running |
$ .github/updatecli.d/bump-go-version.sh 1.25.2-1Update Go version 1.25.2-1
diff --git a/go/arm/Dockerfile.tmpl b/go/arm/Dockerfile.tmpl
index e7570c9..f5ff727 100644
--- a/go/arm/Dockerfile.tmpl
+++ b/go/arm/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM --platform=linux/amd64 ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION} AS stage-amd64
@@ -46,7 +46,7 @@ RUN apt install -y \
{{- end }}
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM --platform=linux/arm64 ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION} AS stage-arm64
diff --git a/go/armel/Dockerfile.tmpl b/go/armel/Dockerfile.tmpl
index 5873789..5ac4ac1 100644
--- a/go/armel/Dockerfile.tmpl
+++ b/go/armel/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/armhf/Dockerfile.tmpl b/go/armhf/Dockerfile.tmpl
index 87ef5ba..6dafa03 100644
--- a/go/armhf/Dockerfile.tmpl
+++ b/go/armhf/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl
index 8a4c066..216831e 100644
--- a/go/base-arm/Dockerfile.tmpl
+++ b/go/base-arm/Dockerfile.tmpl
@@ -68,11 +68,11 @@ ARG VERSION
ARG SECURITY_VERSION=-1
ARG GOLANG_DOWNLOAD_URL=https://aka.ms/golang/release/latest/go$VERSION$SECURITY_VERSION.linux-arm64.tar.gz
# Use a different arg name for microsoft/go sha so it can be handled seperately from the regular golang sha
-ARG MSFT_DOWNLOAD_SHA256=011bb6986c2fd978d5a74e70b5d3905ee6e35a24137732b78ec319dfdbdb077a
+ARG MSFT_DOWNLOAD_SHA256=9740a895843b92ce4c1e3d559dbeea265541efc0fda4d14e7ca995caefd7b64f
ARG DOWNLOAD_SHA256=$MSFT_DOWNLOAD_SHA256
{{- else}}
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$VERSION.linux-arm64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9
+ARG GOLANG_DOWNLOAD_SHA256=9aaeb044bf8dbf50ca2fbf0edc5ebc98b90d5bda8c6b2911526df76f61232919
ARG DOWNLOAD_SHA256=$GOLANG_DOWNLOAD_SHA256
{{- end}}
diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl
index aefe6a9..9a29bea 100644
--- a/go/base/Dockerfile.tmpl
+++ b/go/base/Dockerfile.tmpl
@@ -36,11 +36,11 @@ ARG VERSION
ARG SECURITY_VERSION=-1
ARG GOLANG_DOWNLOAD_URL=https://aka.ms/golang/release/latest/go$VERSION$SECURITY_VERSION.linux-amd64.tar.gz
# Use a different arg name for microsoft/go sha so it can be handled seperately from the regular golang sha
-ARG MSFT_DOWNLOAD_SHA256=48e42b9e3554e106326d326624733fa7da9c4f315cd7e04d764adeb3f285c582
+ARG MSFT_DOWNLOAD_SHA256=42746b2774e8c142a1d19699e56cbaef373beeab0f9110c2a39bf22ce71ff232
ARG DOWNLOAD_SHA256=$MSFT_DOWNLOAD_SHA256
{{- else}}
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$VERSION.linux-amd64.tar.gz
-ARG GOLANG_DOWNLOAD_SHA256=9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b
+ARG GOLANG_DOWNLOAD_SHA256=d7fa7f8fbd16263aa2501d681b11f972a5fd8e811f7b10cb9b26d031a3d7454b
ARG DOWNLOAD_SHA256=$GOLANG_DOWNLOAD_SHA256
{{- end }}
diff --git a/go/darwin-arm64/Dockerfile.tmpl b/go/darwin-arm64/Dockerfile.tmpl
index 759f9ba..e341ac4 100644
--- a/go/darwin-arm64/Dockerfile.tmpl
+++ b/go/darwin-arm64/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
{{- if or (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11") (eq .DEBIAN_VERSION "12")}}
FROM --platform=linux/arm64 docker.elastic.co/beats-dev/golang-crossbuild:llvm-apple-debian{{ .DEBIAN_VERSION }}-arm64 AS build-llvm-apple
diff --git a/go/darwin/Dockerfile.tmpl b/go/darwin/Dockerfile.tmpl
index 63e7eb9..4d196e1 100644
--- a/go/darwin/Dockerfile.tmpl
+++ b/go/darwin/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
{{- if or (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11") (eq .DEBIAN_VERSION "12")}}
diff --git a/go/main/Dockerfile.tmpl b/go/main/Dockerfile.tmpl
index 014aad6..c868b6f 100644
--- a/go/main/Dockerfile.tmpl
+++ b/go/main/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/mips/Dockerfile.tmpl b/go/mips/Dockerfile.tmpl
index 7804750..2d46b8f 100644
--- a/go/mips/Dockerfile.tmpl
+++ b/go/mips/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/mips32/Dockerfile.tmpl b/go/mips32/Dockerfile.tmpl
index a336c41..72c2fd2 100644
--- a/go/mips32/Dockerfile.tmpl
+++ b/go/mips32/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/npcap/Dockerfile.tmpl b/go/npcap/Dockerfile.tmpl
index d7672d1..5d16bbc 100644
--- a/go/npcap/Dockerfile.tmpl
+++ b/go/npcap/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-main${TAG_EXTENSION}
diff --git a/go/ppc/Dockerfile.tmpl b/go/ppc/Dockerfile.tmpl
index 2e95c6b..33545a3 100644
--- a/go/ppc/Dockerfile.tmpl
+++ b/go/ppc/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/s390x/Dockerfile.tmpl b/go/s390x/Dockerfile.tmpl
index 8dd3991..4141362 100644
--- a/go/s390x/Dockerfile.tmpl
+++ b/go/s390x/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
diff --git a/go/windows-arm64/Dockerfile.tmpl b/go/windows-arm64/Dockerfile.tmpl
index 881ff14..1532e97 100644
--- a/go/windows-arm64/Dockerfile.tmpl
+++ b/go/windows-arm64/Dockerfile.tmpl
@@ -1,5 +1,5 @@
ARG REPOSITORY=docker.elastic.co/beats-dev
-ARG VERSION=1.25.5
+ARG VERSION=1.25.2
ARG TAG_EXTENSION=''
FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base-arm${TAG_EXTENSION} |
Confirmed working as expected. Running
The script properly uses |
|
buildkite test this |
💛 Build succeeded, but was flaky
Failed CI Steps |
Docker builds were emitting warnings for
InvalidDefaultArgInFrom,LegacyKeyValueFormat, andFromAsCasingacross all Dockerfile templates.Changes
Added default values to ARG declarations before FROM statements to satisfy InvalidDefaultArgInFrom lint rule:
Defaults are
DEBIAN_VERSION=9,REPOSITORY=docker.elastic.co/beats-dev,VERSION=1.25.5. Build-time overrides via--build-argremain unchanged.Converted ENV statements to key=value format to satisfy LegacyKeyValueFormat lint rule:
Uppercased AS keyword in multi-stage builds to satisfy FromAsCasing lint rule:
Updated
.github/updatecli.d/bump-go-version.shto maintain consistency with the newARG VERSION=defaults:ARG VERSION=x.y.zin all Dockerfile.tmpl files when bumping Go versionsAll 15 Dockerfile templates updated. No functional changes—purely syntax corrections for Docker best practices and automation compatibility.
Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.