Skip to content

Commit df4a4da

Browse files
tklausergopherbot
authored andcommitted
unix/linux: adjust Dockerfile ENV key value format
This fixes the following warnings emitted when running mkall.sh on GOOS=linux with a recent Docker version: 6 warnings found (use --debug to expand): - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 4) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 24) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 25) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 26) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 33) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 56) Also see https://docs.docker.com/reference/build-checks/legacy-key-value-format/ Change-Id: Icdf05cbe7b8650fc2fec84e010c7401807f5f75f Reviewed-on: https://go-review.googlesource.com/c/sys/+/621956 Reviewed-by: Ian Lance Taylor <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Ian Lance Taylor <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 696d342 commit df4a4da

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

unix/linux/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:24.10
22

33
# Disable interactive prompts on package installation
4-
ENV DEBIAN_FRONTEND noninteractive
4+
ENV DEBIAN_FRONTEND=noninteractive
55

66
# Dependencies to get the git sources and go binaries
77
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -21,16 +21,16 @@ RUN git clone --branch v6.11 --depth 1 https://kernel.googlesource.com/pub/scm/l
2121
RUN git clone --branch release/2.40/master --depth 1 https://sourceware.org/git/glibc.git
2222

2323
# Get Go
24-
ENV GOLANG_VERSION 1.23.0
25-
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
26-
ENV GOLANG_DOWNLOAD_SHA256 905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3
24+
ENV GOLANG_VERSION=1.23.0
25+
ENV GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
26+
ENV GOLANG_DOWNLOAD_SHA256=905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3
2727

2828
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
2929
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
3030
&& tar -C /usr/local -xzf golang.tar.gz \
3131
&& rm golang.tar.gz
3232

33-
ENV PATH /usr/local/go/bin:$PATH
33+
ENV PATH=/usr/local/go/bin:$PATH
3434

3535
# Linux and Glibc build dependencies and emulator
3636
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -53,6 +53,6 @@ RUN apt-get update && apt-get install -y \
5353
&& rm -rf /var/lib/apt/lists/*
5454

5555
# Let the scripts know they are in the docker environment
56-
ENV GOLANG_SYS_BUILD docker
56+
ENV GOLANG_SYS_BUILD=docker
5757
WORKDIR /build/unix
5858
ENTRYPOINT ["go", "run", "linux/mkall.go", "/git/linux", "/git/glibc"]

0 commit comments

Comments
 (0)