Skip to content

Commit 0c14a45

Browse files
committedFeb 5, 2020
fix(index): copy correct opm bin builder path
1 parent 0652a72 commit 0c14a45

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
 

‎index.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM quay.io/operator-framework/upstream-registry-builder AS builder
33
FROM scratch
44
LABEL operators.operatorframework.io.index.database.v1=./index.db
55
COPY database ./
6-
COPY --from=builder /build/bin/opm /opm
6+
COPY --from=builder /bin/opm /opm
77
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
88
EXPOSE 50051
99
ENTRYPOINT ["/opm"]

‎pkg/containertools/dockerfilegenerator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (g *IndexDockerfileGenerator) GenerateIndexDockerfile(binarySourceImage, da
5353

5454
// Content
5555
dockerfile += fmt.Sprintf("COPY %s ./\n", databaseFolder)
56-
dockerfile += fmt.Sprintf("COPY --from=builder /build/bin/opm /opm\n")
56+
dockerfile += fmt.Sprintf("COPY --from=builder /bin/opm /opm\n")
5757
dockerfile += fmt.Sprintf("COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe\n")
5858
dockerfile += fmt.Sprintf("EXPOSE 50051\n")
5959
dockerfile += fmt.Sprintf("ENTRYPOINT [\"/opm\"]\n")

‎pkg/containertools/dockerfilegenerator_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestGenerateDockerfile(t *testing.T) {
2121
FROM scratch
2222
LABEL operators.operatorframework.io.index.database.v1=./index.db
2323
COPY database ./
24-
COPY --from=builder /build/bin/opm /opm
24+
COPY --from=builder /bin/opm /opm
2525
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
2626
EXPOSE 50051
2727
ENTRYPOINT ["/opm"]
@@ -48,7 +48,7 @@ func TestGenerateDockerfile_EmptyBaseImage(t *testing.T) {
4848
FROM scratch
4949
LABEL operators.operatorframework.io.index.database.v1=./index.db
5050
COPY database ./
51-
COPY --from=builder /build/bin/opm /opm
51+
COPY --from=builder /bin/opm /opm
5252
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
5353
EXPOSE 50051
5454
ENTRYPOINT ["/opm"]

0 commit comments

Comments
 (0)
Please sign in to comment.