Skip to content

Commit

Permalink
Update ENV directive syntax
Browse files Browse the repository at this point in the history 
Replace deprecated ENV syntax with recommended format.

From Docker's perspective, this should be considered a NOOP.

refs GH-91
  • Loading branch information
@atc0005
atc0005 committed Oct 14, 2020
1 parent 4674731 commit 18a69b5
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 39 deletions.
8 changes: 4 additions & 4 deletions oldstable/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

FROM golang:1.14.9

ENV GOLANGCI_LINT_VERSION v1.31.0
ENV STATICCHECK_VERSION 2020.1.6
ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
ENV APT_TREE_VERSION 1.8.0-1
ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
18 changes: 9 additions & 9 deletions stable/Dockerfile.alpine-build.x64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
FROM golang:1.15.2-alpine3.12

# NOTE: This version was different than the base `gcc` pkg when last checked
ENV APK_GCC_MINGW64_VERSION 9.3.0-r0
ENV APK_GCC_MINGW64_VERSION="9.3.0-r0"

ENV APK_BASH_VERSION 5.0.17-r0
ENV APK_GCC_VERSION 9.3.0-r2
ENV APK_GIT_VERSION 2.26.2-r0
ENV APK_MAKE_VERSION 4.3-r0
ENV APK_UTIL_LINUX_VERSION 2.35.2-r0
ENV APK_FILE_VERSION 5.38-r0
ENV APK_NANO_VERSION 4.9.3-r0
ENV APK_MUSL_DEV_VERSION 1.1.24-r9
ENV APK_BASH_VERSION="5.0.17-r0"
ENV APK_GCC_VERSION="9.3.0-r2"
ENV APK_GIT_VERSION="2.26.2-r0"
ENV APK_MAKE_VERSION="4.3-r0"
ENV APK_UTIL_LINUX_VERSION="2.35.2-r0"
ENV APK_FILE_VERSION="5.38-r0"
ENV APK_NANO_VERSION="4.9.3-r0"
ENV APK_MUSL_DEV_VERSION="1.1.24-r9"

# Install specific version of packages
# RUN apk update && \
Expand Down
18 changes: 9 additions & 9 deletions stable/Dockerfile.alpine-build.x86
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
FROM i386/golang:1.15.2-alpine3.12

# NOTE: This version was different than the base `gcc` pkg when last checked
ENV APK_GCC_MINGW64_VERSION 9.3.0-r0
ENV APK_GCC_MINGW64_VERSION="9.3.0-r0"

ENV APK_BASH_VERSION 5.0.17-r0
ENV APK_GCC_VERSION 9.3.0-r2
ENV APK_GIT_VERSION 2.26.2-r0
ENV APK_MAKE_VERSION 4.3-r0
ENV APK_UTIL_LINUX_VERSION 2.35.2-r0
ENV APK_FILE_VERSION 5.38-r0
ENV APK_NANO_VERSION 4.9.3-r0
ENV APK_MUSL_DEV_VERSION 1.1.24-r9
ENV APK_BASH_VERSION="5.0.17-r0"
ENV APK_GCC_VERSION="9.3.0-r2"
ENV APK_GIT_VERSION="2.26.2-r0"
ENV APK_MAKE_VERSION="4.3-r0"
ENV APK_UTIL_LINUX_VERSION="2.35.2-r0"
ENV APK_FILE_VERSION="5.38-r0"
ENV APK_NANO_VERSION="4.9.3-r0"
ENV APK_MUSL_DEV_VERSION="1.1.24-r9"

# Install specific version of packages
# RUN apk update && \
Expand Down
8 changes: 4 additions & 4 deletions stable/Dockerfile.combined
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

FROM golang:1.15.2

ENV GOLANGCI_LINT_VERSION v1.31.0
ENV STATICCHECK_VERSION 2020.1.6
ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
ENV APT_TREE_VERSION 1.8.0-1
ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
12 changes: 6 additions & 6 deletions stable/Dockerfile.debian-build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

FROM golang:1.15.2

ENV GOLANGCI_LINT_VERSION v1.31.0
ENV STATICCHECK_VERSION 2020.1.6
ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
ENV APT_TREE_VERSION 1.8.0-1
ENV APT_GCC_MULTILIB_VERSION 4:8.3.0-1
ENV APT_GCC_MINGW_W64_VERSION 8.3.0-6+21.3~deb10u1
ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"
ENV APT_GCC_MULTILIB_VERSION="4:8.3.0-1"
ENV APT_GCC_MINGW_W64_VERSION="8.3.0-6+21.3~deb10u1"

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
6 changes: 3 additions & 3 deletions stable/Dockerfile.linting
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# use the same environment as our final image for binary compatibility
FROM golangci/golangci-lint:v1.31.0-alpine as builder

ENV STATICCHECK_VERSION 2020.1.6
ENV STATICCHECK_VERSION="2020.1.6"

# Skip go clean step as the entire image will be tossed after we are finished
# and cleaning the modules cache takes extra time that won't help the final
Expand All @@ -25,8 +25,8 @@ RUN GO111MODULE="on" go get honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VER
FROM golangci/golangci-lint:v1.31.0-alpine

# Intended to help identify the versions of the included linting tools
ENV GOLANGCI_LINT_VERSION v1.31.0
ENV STATICCHECK_VERSION 2020.1.6
ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV STATICCHECK_VERSION="2020.1.6"

COPY --from=builder /go/bin/staticcheck /usr/bin/staticcheck

Expand Down
8 changes: 4 additions & 4 deletions unstable/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

FROM golang:1.15.2

ENV GOLANGCI_LINT_VERSION v1.31.0
ENV STATICCHECK_VERSION 2020.1.6
ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
ENV APT_TREE_VERSION 1.8.0-1
ENV GOLANGCI_LINT_VERSION="v1.31.0"
ENV STATICCHECK_VERSION="2020.1.6"
ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
ENV APT_TREE_VERSION="1.8.0-1"

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down

0 comments on commit 18a69b5

Please sign in to comment.