Merge pull request #1101 from coreydaley/update_release_for_go1.18

Updating release code to use go1.18
openshift · Dec 14, 2022 · 78363ee · 78363ee
2 parents 1a45fe6 + 3944af6
commit 78363ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/hack/common.sh b/hack/common.sh
@@ -34,8 +34,8 @@ readonly S2I_CROSS_COMPILE_PLATFORMS=(
   linux/386
   linux/ppc64le
   linux/s390x
-  linux/aarch64
-  darwin/aarch64
+  #linux/aarch64
+  #darwin/aarch64
 )
 readonly S2I_CROSS_COMPILE_TARGETS=(
   cmd/s2i

diff --git a/images/release/Dockerfile b/images/release/Dockerfile
@@ -5,14 +5,14 @@
 #
 FROM registry.redhat.io/ubi8/ubi
 
-ENV VERSION=1.12.5 \
+ENV VERSION=1.18 \
     GOARM=5 \
     GOPATH=/go \
     GOROOT=/usr/local/go \
     S2I_VERSION_FILE=/go/src/github.com/openshift/source-to-image/sti-version-defs
 ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
 
-RUN yum install -y gcc zip && \
+RUN yum install -y git gcc zip && \
     yum clean all && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
     touch /sti-build-image && \