Skip to content

Commit 831a414

Browse files
Merge pull request #554 from ecordell/go-modules
Switch to go modules
2 parents 7790503 + 694b59b commit 831a414

File tree

992 files changed

+89845
-237423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

992 files changed

+89845
-237423
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.git/objects
2+
./bin/*

.gitlab-ci.jsonnet

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ local jobs = {
5757
'builder': images.ci.olm.name,
5858
'olm': images.prerelease.olm.name,
5959
'e2e': images.e2e.name,
60-
}) +
61-
docker.run(images.ci.olm.name, "make verify-codegen verify-catalog")
60+
})
6261
},
6362

6463
'container-release': baseJob.dockerBuild {

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ container-build:
6262
- docker push quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}
6363
- docker push quay.io/coreos/olm-e2e:${CI_COMMIT_REF_SLUG}-${SHA8}
6464
- docker push quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre
65-
- docker run quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG} make verify-codegen verify-catalog
6665
stage: docker_build
6766
tags:
6867
- kubernetes

Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ ENV GOPATH /go
66
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
77

88
WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
9-
COPY . .
9+
10+
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
11+
COPY .git/HEAD .git/HEAD
12+
COPY .git/refs/heads/. .git/refs/heads
13+
RUN mkdir -p .git/objects
14+
15+
COPY Makefile Makefile
16+
COPY OLM_VERSION OLM_VERSION
17+
COPY pkg pkg
18+
COPY vendor vendor
19+
COPY cmd cmd
20+
COPY test test
1021
RUN make build
1122

1223

0 commit comments

Comments
 (0)