From 6452b4708d60f2c69ce96239a4757ca54a4693ad Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Thu, 11 Aug 2022 13:28:33 -0700 Subject: [PATCH 1/7] Upgrade build image to use go 1.19 Signed-off-by: Alvin Lin --- build-image/Dockerfile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 10ef971fcab..32914edfb52 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.8-buster +FROM golang:1.19.0-buster ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \ @@ -10,8 +10,8 @@ RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # and viceversa. RUN npm install -g postcss-cli@7.1.2 autoprefixer@9.8.5 -ENV HUGO_VERSION=v0.94.3 -RUN git clone https://github.com/alvinlin123/hugo.git --branch ${HUGO_VERSION} --depth 1 && \ +ENV HUGO_VERSION=v0.101.0 +RUN git clone https://github.com/gohugoio/hugo.git --branch ${HUGO_VERSION} --depth 1 && \ cd hugo && go install --tags extended && cd ../ && \ rm -rf hugo/ && rm -rf /go/pkg /go/src /root/.cache @@ -30,15 +30,14 @@ RUN GOARCH=$(go env GOARCH) && \ RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0 -RUN GO111MODULE=on go get \ - github.com/client9/misspell/cmd/misspell@v0.3.4 \ - github.com/golang/protobuf/protoc-gen-go@v1.3.1 \ - github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 \ - github.com/gogo/protobuf/gogoproto@v1.3.0 \ - github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 \ - github.com/fatih/faillint@v1.5.0 \ - github.com/campoy/embedmd@v1.0.0 \ - && rm -rf /go/pkg /go/src /root/.cache +RUN GO111MODULE=on go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ + GO111MODULE=on go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ + GO111MODULE=on go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 &&\ + GO111MODULE=on go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 &&\ + GO111MODULE=on go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 &&\ + GO111MODULE=on go install github.com/fatih/faillint@v1.5.0 &&\ + GO111MODULE=on go install github.com/campoy/embedmd@v1.0.0 &&\ + rm -rf /go/pkg /go/src /root/.cache ENV NODE_PATH=/usr/lib/node_modules COPY build.sh / From 50ef2ae1f6d3a4bc7595f2a3bd458488cff83b14 Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Thu, 11 Aug 2022 14:38:46 -0700 Subject: [PATCH 2/7] GO111MODULE=on is not needef for go install Signed-off-by: Alvin Lin --- build-image/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 32914edfb52..7fe66e2cb37 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -30,13 +30,13 @@ RUN GOARCH=$(go env GOARCH) && \ RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0 -RUN GO111MODULE=on go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ - GO111MODULE=on go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ - GO111MODULE=on go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 &&\ - GO111MODULE=on go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 &&\ - GO111MODULE=on go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 &&\ - GO111MODULE=on go install github.com/fatih/faillint@v1.5.0 &&\ - GO111MODULE=on go install github.com/campoy/embedmd@v1.0.0 &&\ +RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ + go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ + go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 &&\ + go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 &&\ + go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 &&\ + go install github.com/fatih/faillint@v1.5.0 &&\ + go install github.com/campoy/embedmd@v1.0.0 &&\ rm -rf /go/pkg /go/src /root/.cache ENV NODE_PATH=/usr/lib/node_modules From c5d08cd9c3d7a16123fee46174cfbb2cb7793e11 Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Thu, 11 Aug 2022 14:55:14 -0700 Subject: [PATCH 3/7] Install Hugo without gitclone Signed-off-by: Alvin Lin --- build-image/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 7fe66e2cb37..13f5c196a28 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -10,10 +10,6 @@ RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # and viceversa. RUN npm install -g postcss-cli@7.1.2 autoprefixer@9.8.5 -ENV HUGO_VERSION=v0.101.0 -RUN git clone https://github.com/gohugoio/hugo.git --branch ${HUGO_VERSION} --depth 1 && \ - cd hugo && go install --tags extended && cd ../ && \ - rm -rf hugo/ && rm -rf /go/pkg /go/src /root/.cache ENV SHFMT_VERSION=3.2.4 RUN GOARCH=$(go env GOARCH) && \ @@ -30,13 +26,14 @@ RUN GOARCH=$(go env GOARCH) && \ RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0 +ENV HUGO_VERSION=v0.101.0 RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ - go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 &&\ go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 &&\ go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 &&\ go install github.com/fatih/faillint@v1.5.0 &&\ go install github.com/campoy/embedmd@v1.0.0 &&\ + go install --tags extended github.com/gohugoio/hugo@${HUGO_VERSION} &&\ rm -rf /go/pkg /go/src /root/.cache ENV NODE_PATH=/usr/lib/node_modules From b27b8e152654e1d00e7ed12d82afcfbcf09d0679 Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Thu, 11 Aug 2022 15:02:24 -0700 Subject: [PATCH 4/7] Remove bad blank line Signed-off-by: Alvin Lin --- build-image/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 13f5c196a28..d671c1787c7 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -10,7 +10,6 @@ RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # and viceversa. RUN npm install -g postcss-cli@7.1.2 autoprefixer@9.8.5 - ENV SHFMT_VERSION=3.2.4 RUN GOARCH=$(go env GOARCH) && \ if [ "$GOARCH" = "amd64" ]; then \ From 19f603426b74bcef9849d16a5be723fec653d63b Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Thu, 11 Aug 2022 15:50:37 -0700 Subject: [PATCH 5/7] Upgrade golangci-lint to a verion that supports go 1.19 Signed-off-by: Alvin Lin --- build-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index d671c1787c7..4c78ccc5425 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -23,7 +23,7 @@ RUN GOARCH=$(go env GOARCH) && \ chmod +x shfmt && \ mv shfmt /usr/bin -RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0 +RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.48.0 ENV HUGO_VERSION=v0.101.0 RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ From bae2da9df7f03da7b6d844152d545c26b26dc3b8 Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Thu, 11 Aug 2022 18:24:51 -0700 Subject: [PATCH 6/7] upgrade faillit Signed-off-by: Alvin Lin --- build-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 4c78ccc5425..849c5849b9b 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -30,7 +30,7 @@ RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 &&\ go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 &&\ go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 &&\ - go install github.com/fatih/faillint@v1.5.0 &&\ + go install github.com/fatih/faillint@v1.10.0 &&\ go install github.com/campoy/embedmd@v1.0.0 &&\ go install --tags extended github.com/gohugoio/hugo@${HUGO_VERSION} &&\ rm -rf /go/pkg /go/src /root/.cache From 00d037317d93f3d176e033f9c74e441106e83bcf Mon Sep 17 00:00:00 2001 From: Alvin Lin Date: Fri, 12 Aug 2022 09:08:49 -0700 Subject: [PATCH 7/7] Upgrade faillint Signed-off-by: Alvin Lin --- build-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 849c5849b9b..52201021aad 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -30,7 +30,7 @@ RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ go install github.com/golang/protobuf/protoc-gen-go@v1.3.1 &&\ go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 &&\ go install github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 &&\ - go install github.com/fatih/faillint@v1.10.0 &&\ + go install github.com/fatih/faillint@v1.11.0 &&\ go install github.com/campoy/embedmd@v1.0.0 &&\ go install --tags extended github.com/gohugoio/hugo@${HUGO_VERSION} &&\ rm -rf /go/pkg /go/src /root/.cache