Build image now supports linux/arm64 as well #4165
+45
−34
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,42 +13,43 @@ RUN npm install -g [email protected] [email protected] | |
| ENV HUGO_VERSION=v0.72.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 | ||
|
There was a problem hiding this comment. Bumped version, as 3.1.0 had no arm64 binary. |
||
| RUN GOARCH=$(go env GOARCH) && \ | ||
| if [ "$GOARCH" = "amd64" ]; then \ | ||
| DIGEST=3f5a47f8fec27fae3e06d611559a2063f5d27e4b9501171dde9959b8c60a3538; \ | ||
| elif [ "$GOARCH" = "arm64" ]; then \ | ||
| DIGEST=6474d9cc08a1c9fe2ef4be7a004951998e3067d46cf55a011ddd5ff7bfab3de6; \ | ||
| fi && \ | ||
| URL=https://github.com/mvdan/sh/releases/download/v${SHFMT_VERSION}/shfmt_v${SHFMT_VERSION}_linux_${GOARCH}; \ | ||
| curl -fsSLo shfmt "${URL}" && \ | ||
| echo "$DIGEST shfmt" | sha256sum -c && \ | ||
| chmod +x shfmt && \ | ||
| mv shfmt /usr/bin | ||
|
|
||
| RUN curl -sfL https://github.com/raw/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0 | ||
|
There was a problem hiding this comment. What's the impact of removing There was a problem hiding this comment. According to https://golang.org/doc/go1.5, There was a problem hiding this comment. In practice, I haven't noticed any difference. There was a problem hiding this comment.
I've updated this PR to use newly built image from this PR. |
||
|
|
||
| RUN GO111MODULE=on go get \ | ||
| github.com/client9/misspell/cmd/[email protected] \ | ||
| github.com/golang/protobuf/[email protected] \ | ||
| github.com/gogo/protobuf/[email protected] \ | ||
| github.com/gogo/protobuf/[email protected] \ | ||
| github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 \ | ||
| github.com/fatih/[email protected] \ | ||
| github.com/campoy/[email protected] \ | ||
| && rm -rf /go/pkg /go/src /root/.cache | ||
|
|
||
| # Cannot get it to run together in above go get. | ||
| RUN GO111MODULE=on go get \ | ||
| github.com/instrumenta/[email protected] \ | ||
| && rm -rf /go/pkg /go/src /root/.cache | ||
|
|
||
| ENV NODE_PATH=/usr/lib/node_modules | ||
| COPY build.sh / | ||
| ENV GOCACHE=/go/cache | ||
| ENTRYPOINT ["/build.sh"] | ||
|
|
||
|
There was a problem hiding this comment. Moved faillint to shared go get build. |
||
|
There was a problem hiding this comment. Moved embedmd to shared go get build. |
||
| ARG revision | ||
| LABEL org.opencontainers.image.title="build-image" \ | ||
| org.opencontainers.image.source="https://github.com/cortexproject/cortex/tree/master/build-image" \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this removed? I think we need it to keep CI working, am I wrong?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's back now... in single docker build command, with multiple
-tflags.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted it back, due to upcoming change in #4211, which builds images for both platforms, but only tags native one with
$(IMAGE_PREFIX)$(shell basename $(@D)).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to revert that change in #4211, as Github Actions don't support
--platformargument when running docker :(