Skip to content

Commit

Permalink
Merge pull request #241 from spangenberg/go-modules
Browse files Browse the repository at this point in the history
Switch to go modules
  • Loading branch information
openshift-merge-robot authored Aug 26, 2019
2 parents 0278133 + 9cd6298 commit 1a25c53
Show file tree
Hide file tree
Showing 9,129 changed files with 118,500 additions and 3,715,069 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
tfManifests/

bin/
.gobincache/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
RUN unset VERSION \
&& NO_DOCKER=1 make build
&& GOPROXY=off NO_DOCKER=1 make build

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
RUN INSTALL_PKGS=" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
RUN unset VERSION \
&& NO_DOCKER=1 make build
&& GOPROXY=off NO_DOCKER=1 make build

FROM registry.svc.ci.openshift.org/ocp/4.0:base
RUN INSTALL_PKGS=" \
Expand Down
Loading

0 comments on commit 1a25c53

Please sign in to comment.