alihan/odo
1
0
Fork 0
mirror of https://github.com/redhat-developer/odo.git synced 2025-10-19 03:06:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Updating golang version to 1.15 (#4121)" (#4132)

Browse Source 
This reverts commit 436015d028.
This commit is contained in:
Girish Ramnani
2020-10-23 13:54:53 +05:30
committed by GitHub
parent 0f38a9e5f9
commit 53fd14e764
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.rhel
View File

@@ -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

2
openshift-ci/build-root/Dockerfile
View File

@@ -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

2
openshift-ci/build-root/Dockerfile.travislogin
View File

@@ -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 \

4
scripts/rpm-prepare.sh
View File

@@ -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"