From a122c737b6e8ac09bc0ddff634a3f04ebf7979c9 Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 2 Dec 2022 12:20:32 +0100 Subject: [PATCH 1/6] ci-operator/config/openshift/cincinnati-graph-data: Publish graph-data image --- ...penshift-cincinnati-graph-data-master.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml index 7f3d7c77638d8..5c0bee6369e99 100644 --- a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml +++ b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml @@ -21,6 +21,30 @@ images: to: stable - dockerfile_path: graph-data.rs/Dockerfile to: graphdata-unittests +- dockerfile_literal: |- + FROM source + WORKDIR /src + COPY . . + FROM scratch + COPY --from=build /src/blocked-edges /blocked-edges + COPY --from=build /src/channels /channels + COPY --from=build /src/raw /raw + USER 1000:1000 + ENV PATH / + ENV HOME / + WORKDIR / + ENTRYPOINT ["/this-image-is-not-executable"] + inputs: + src: + as: + - source + to: graph-data +promotion: + excluded_images: + - stable + - graphdata-unittests + name: cincinnati-graph-data + namespace: cincinnati-ci-public raw_steps: - pipeline_image_cache_step: commands: | From 686a9420e2ed66fd1771063a28bca015659b5299 Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 2 Dec 2022 12:30:24 +0100 Subject: [PATCH 2/6] fix --- .../openshift-cincinnati-graph-data-master.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml index 5c0bee6369e99..be5b1bb6c198a 100644 --- a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml +++ b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml @@ -22,9 +22,10 @@ images: - dockerfile_path: graph-data.rs/Dockerfile to: graphdata-unittests - dockerfile_literal: |- - FROM source + FROM source AS build WORKDIR /src COPY . . + FROM scratch COPY --from=build /src/blocked-edges /blocked-edges COPY --from=build /src/channels /channels From fe65fb0196c106898740388ce1e18dbf0fb7308e Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 2 Dec 2022 12:48:56 +0100 Subject: [PATCH 3/6] More fixes --- .../openshift-cincinnati-graph-data-master.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml index be5b1bb6c198a..f59d23af3fc35 100644 --- a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml +++ b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml @@ -23,8 +23,7 @@ images: to: graphdata-unittests - dockerfile_literal: |- FROM source AS build - WORKDIR /src - COPY . . + COPY . /src FROM scratch COPY --from=build /src/blocked-edges /blocked-edges From ad317e4669568fcbcc342db6450bac1dbd992b4b Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 2 Dec 2022 13:05:37 +0100 Subject: [PATCH 4/6] Even more fixes --- .../openshift-cincinnati-graph-data-master.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml index f59d23af3fc35..6083898b9583c 100644 --- a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml +++ b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml @@ -22,13 +22,10 @@ images: - dockerfile_path: graph-data.rs/Dockerfile to: graphdata-unittests - dockerfile_literal: |- - FROM source AS build - COPY . /src - FROM scratch - COPY --from=build /src/blocked-edges /blocked-edges - COPY --from=build /src/channels /channels - COPY --from=build /src/raw /raw + COPY /src/blocked-edges /blocked-edges + COPY /src/channels /channels + COPY /src/raw /raw USER 1000:1000 ENV PATH / ENV HOME / @@ -36,8 +33,9 @@ images: ENTRYPOINT ["/this-image-is-not-executable"] inputs: src: - as: - - source + paths: + - destination_dir: '/src' + source_path: '/go/src/github.com/openshift/cincinnati-graph-data' to: graph-data promotion: excluded_images: From 27057673257c12331bedb89a3aab06e3c92586ff Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 2 Dec 2022 13:16:12 +0100 Subject: [PATCH 5/6] My hands are typing words --- .../openshift-cincinnati-graph-data-master.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml index 6083898b9583c..16e621dfa293d 100644 --- a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml +++ b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml @@ -23,9 +23,9 @@ images: to: graphdata-unittests - dockerfile_literal: |- FROM scratch - COPY /src/blocked-edges /blocked-edges - COPY /src/channels /channels - COPY /src/raw /raw + COPY blocked-edges /blocked-edges + COPY channels /channels + COPY raw /raw USER 1000:1000 ENV PATH / ENV HOME / @@ -34,7 +34,7 @@ images: inputs: src: paths: - - destination_dir: '/src' + - destination_dir: '.' source_path: '/go/src/github.com/openshift/cincinnati-graph-data' to: graph-data promotion: From e08a2a5481ddfc3328cffccda7f2ef1e3a5630cf Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Fri, 2 Dec 2022 13:24:22 +0100 Subject: [PATCH 6/6] Haaaaaaaaannds --- .../openshift-cincinnati-graph-data-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml index 16e621dfa293d..0ab0be651ac5a 100644 --- a/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml +++ b/ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml @@ -35,7 +35,7 @@ images: src: paths: - destination_dir: '.' - source_path: '/go/src/github.com/openshift/cincinnati-graph-data' + source_path: '/go/src/github.com/openshift/cincinnati-graph-data/.' to: graph-data promotion: excluded_images: