From f7f5eb9227b7fbf126d943ebb31626bfb18e7f7f Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 11 Dec 2020 19:39:28 +0100 Subject: [PATCH] Update ENV syntax --- 19.03-rc/Dockerfile | 2 +- 19.03-rc/dind/Dockerfile | 2 +- 19.03/Dockerfile | 2 +- 19.03/dind/Dockerfile | 2 +- 20.10-rc/Dockerfile | 2 +- 20.10-rc/dind/Dockerfile | 2 +- 20.10/Dockerfile | 2 +- 20.10/dind/Dockerfile | 2 +- Dockerfile-dind.template | 2 +- Dockerfile-windows-windowsservercore.template | 4 ++-- Dockerfile.template | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile index 0d34e9289..9fa0287f7 100644 --- a/19.03-rc/Dockerfile +++ b/19.03-rc/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --no-cache \ # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf -ENV DOCKER_VERSION 19.03.13-beta2 +ENV DOCKER_VERSION=19.03.13-beta2 # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/19.03-rc/dind/Dockerfile b/19.03-rc/dind/Dockerfile index 19acf1cb9..a4826de3d 100644 --- a/19.03-rc/dind/Dockerfile +++ b/19.03-rc/dind/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT=ed89041433a031cafc0a0f19cfe573c31688d377 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/19.03/Dockerfile b/19.03/Dockerfile index d8c79f23a..582ec0368 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --no-cache \ # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf -ENV DOCKER_VERSION 19.03.14 +ENV DOCKER_VERSION=19.03.14 # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/19.03/dind/Dockerfile b/19.03/dind/Dockerfile index dc580c2a6..aec917646 100644 --- a/19.03/dind/Dockerfile +++ b/19.03/dind/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT=ed89041433a031cafc0a0f19cfe573c31688d377 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile index 0e1ab7a10..5654c3aae 100644 --- a/20.10-rc/Dockerfile +++ b/20.10-rc/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --no-cache \ # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf -ENV DOCKER_VERSION 20.10.0-rc2 +ENV DOCKER_VERSION=20.10.0-rc2 # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile index 084c12d08..18341edbc 100644 --- a/20.10-rc/dind/Dockerfile +++ b/20.10-rc/dind/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT=ed89041433a031cafc0a0f19cfe573c31688d377 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 51fc4f43b..3e2dc7421 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --no-cache \ # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf -ENV DOCKER_VERSION 20.10.0 +ENV DOCKER_VERSION=20.10.0 # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 3c02f486b..54d2c88b9 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT=ed89041433a031cafc0a0f19cfe573c31688d377 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 1248fa51e..1b591f48a 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -31,7 +31,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT {{ .dindCommit }} +ENV DIND_COMMIT={{ .dindCommit }} RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/Dockerfile-windows-windowsservercore.template b/Dockerfile-windows-windowsservercore.template index 89ad458cb..cde8be214 100644 --- a/Dockerfile-windows-windowsservercore.template +++ b/Dockerfile-windows-windowsservercore.template @@ -9,8 +9,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); # doing this first to share cache across versions more aggressively -ENV DOCKER_CHANNEL %%DOCKER-CHANNEL%% -ENV DOCKER_VERSION %%DOCKER-VERSION%% +ENV DOCKER_CHANNEL=%%DOCKER-CHANNEL%% +ENV DOCKER_VERSION=%%DOCKER-VERSION%% # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/Dockerfile.template b/Dockerfile.template index a51f771a5..fbc670cce 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -11,7 +11,7 @@ RUN apk add --no-cache \ # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf -ENV DOCKER_VERSION {{ .version }} +ENV DOCKER_VERSION={{ .version }} # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)