Skip to content
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

Jump to bottom

Bug 1788155: get ipv6 support from library-go bump; switch to go modules #77

Merged
merged 7 commits into from
Feb 26, 2020
Merged

Bug 1788155: get ipv6 support from library-go bump; switch to go modules #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f70acfc
Bug 1788155: get ipv6 support from library-go bump
jmrodri Feb 20, 2020
64316a3
initialize go mod, drop glide
jmrodri Feb 24, 2020
1bc25b4
bump vendor with go mod
jmrodri Feb 24, 2020
6cf857a
force the inclusion of build-machinery-go
jmrodri Feb 24, 2020
94bc2a1
react to go.mod changes
jmrodri Feb 21, 2020
4cca1ce
react to library-go changes
jmrodri Feb 24, 2020
30cdf63
use go 1.13 builders
jmrodri Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
WORKDIR /go/src/github.com/openshift/cluster-svcat-apiserver-operator
COPY . .
RUN make build --warn-undefined-variables
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
WORKDIR /go/src/github.com/openshift/cluster-svcat-apiserver-operator
COPY . .
RUN make build --warn-undefined-variables
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: build
.PHONY: all

# Include the library makefile
include $(addprefix ./vendor/github.com/openshift/library-go/alpha-build-machinery/make/, \
include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
golang.mk \
targets/openshift/bindata.mk \
targets/openshift/deps.mk \
Expand Down