Skip to content

Commit 7a58081

Browse files
authored
Merge pull request #26 from infosiftr/go1.16
Update to Go 1.16
2 parents e758603 + 7143aaa commit 7a58081

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-buster AS build
1+
FROM golang:1.16-buster AS build
22

33
SHELL ["bash", "-Eeuo", "pipefail", "-xc"]
44

Dockerfile.release

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-buster
1+
FROM golang:1.16-buster
22

33
SHELL ["bash", "-Eeuo", "pipefail", "-xc"]
44

@@ -23,6 +23,7 @@ ENV BASHBREW_ARCHES \
2323
i386 \
2424
mips64le \
2525
ppc64le \
26+
riscv64 \
2627
s390x \
2728
windows-amd64
2829

@@ -39,6 +40,8 @@ RUN export GNUPGHOME="$(mktemp -d)"; \
3940
mkdir -p bin; \
4041
\
4142
for bashbrewArch in $BASHBREW_ARCHES; do \
43+
# TODO convince estesp to release riscv64 binaries (https://github.com/estesp/manifest-tool/pull/113 👀)
44+
if [ "$bashbrewArch" = 'riscv64' ]; then continue; fi; \
4245
( \
4346
goEnv="$(bashbrew-arch-to-goenv.sh "$bashbrewArch")"; eval "$goEnv"; \
4447
srcBin="manifest-tool-$GOOS-$GOARCH"; \

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-buster
1+
FROM golang:1.16-buster
22

33
SHELL ["bash", "-Eeuo", "pipefail", "-xc"]
44

architecture/oci-platform.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var SupportedArches = map[string]OCIPlatform{
2020
"i386": {OS: "linux", Architecture: "386"},
2121
"mips64le": {OS: "linux", Architecture: "mips64le"},
2222
"ppc64le": {OS: "linux", Architecture: "ppc64le"},
23+
"riscv64": {OS: "linux", Architecture: "riscv64"},
2324
"s390x": {OS: "linux", Architecture: "s390x"},
2425

2526
"windows-amd64": {OS: "windows", Architecture: "amd64"},

0 commit comments

Comments
 (0)