Skip to content

Switch origin to go1.11 #3394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Apr 9, 2019
Merged

Switch origin to go1.11 #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae2c9d3
Switch origin to go1.11
soltysh Apr 9, 2019
f649a1f
Bump go1.10 and go1.11 to latest available versions
soltysh Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ci-operator/config/openshift/origin/openshift-origin-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,42 @@ images:
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- dockerfile_path: images/cli/Dockerfile.rhel
from: base
to: cli
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- dockerfile_path: images/cli-artifacts/Dockerfile.rhel
from: cli
to: cli-artifacts
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- dockerfile_path: images/hypershift/Dockerfile.rhel
from: base
to: hypershift
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- dockerfile_path: images/hyperkube/Dockerfile.rhel
from: base
to: hyperkube
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- dockerfile_path: images/tests/Dockerfile.rhel
from: cli
to: tests
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- context_dir: images/deployer/
dockerfile_path: Dockerfile.rhel
from: cli
Expand All @@ -81,7 +81,7 @@ images:
inputs:
bin:
as:
- registry.svc.ci.openshift.org/ocp/builder:golang-1.10
- registry.svc.ci.openshift.org/ocp/builder:golang-1.11
- context_dir: images/os/
from: base
inputs:
Expand Down
8 changes: 8 additions & 0 deletions ci-operator/infra/openshift/origin/images-ocp-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ spec:
scheduled: true
referencePolicy:
type: Local
- name: golang-1.11
from:
kind: DockerImage
name: docker.io/openshift/origin-release:golang-1.11
importPolicy:
scheduled: true
referencePolicy:
type: Local
---
kind: ImageStream
apiVersion: image.openshift.io/v1
Expand Down
2 changes: 1 addition & 1 deletion projects/origin-release/golang-1.10/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
FROM centos:7

ENV VERSION=1.10.3 \
ENV VERSION=1.10.8 \
GOCACHE=/go/.cache \
GOARM=5 \
GOPATH=/go \
Expand Down
2 changes: 1 addition & 1 deletion projects/origin-release/golang-1.11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
FROM centos:7

ENV VERSION=1.11.5 \
ENV VERSION=1.11.8 \
GOCACHE=/go/.cache \
GOARM=5 \
GOPATH=/go \
Expand Down