diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 1ef4de4e2..b79a6e9c5 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,7 +1,7 @@ # This Dockerfile builds an image containing the Linux, Mac and Windows version of odo # layered on top of the ubi7/ubi image. -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder COPY . /go/src/github.com/openshift/odo WORKDIR /go/src/github.com/openshift/odo diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index af7e4f254..bdb291dae 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 RUN yum -y install make wget gcc git httpd-tools diff --git a/openshift-ci/build-root/Dockerfile.travislogin b/openshift-ci/build-root/Dockerfile.travislogin index b87d3cbb1..ce06f6f22 100644 --- a/openshift-ci/build-root/Dockerfile.travislogin +++ b/openshift-ci/build-root/Dockerfile.travislogin @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 RUN yum install sudo -y \ make \ diff --git a/scripts/rpm-prepare.sh b/scripts/rpm-prepare.sh index 66da9285c..9f7bcdfea 100755 --- a/scripts/rpm-prepare.sh +++ b/scripts/rpm-prepare.sh @@ -13,8 +13,8 @@ export ODO_RPM_VERSION=${ODO_VERSION//-} # Golang version variables, if you are bumping this, please contact redhat maintainers to ensure that internal # build systems can handle these versions -export GOLANG_VERSION=${GOLANG_VERSION:-1.15} -export GOLANG_VERSION_NODOT=${GOLANG_VERSION_NODOT:-115} +export GOLANG_VERSION=${GOLANG_VERSION:-1.13} +export GOLANG_VERSION_NODOT=${GOLANG_VERSION_NODOT:-113} # Print env for verifcation echo "Printing envs for verification"