Skip to content

Commit 081e654

Browse files
committed
Workaround COPY behavior in OCP4
1 parent 7c6c10d commit 081e654

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

elasticsearch/Dockerfile.rhel8

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ ADD extra-jvm.options install-es.sh ci-env.sh /var/tmp
4141
# Since artifacts does not exist during CI build, include README.MD
4242
# which will prevent the copy from raising an error.
4343
RUN mkdir /artifacts
44-
COPY README.md artifacts/* /artifacts
44+
# In an OSBS build, this will COPY artifacts from fetch-artifacts-koji.yaml. In a CI build, it will just
45+
# copy the README.MD.
46+
COPY artifacts/* /artifacts
4547
RUN /var/tmp/install-es.sh
4648

4749
ADD sgconfig/ ${HOME}/sgconfig/

elasticsearch/artifacts/README.MD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
See Dockerfile.rhel8 for where this directory is copied into the
2+
image during a build. During an OSBS build, this directory will
3+
be populated from artifacts from within the Red Hat firewall.
4+
During a CI build, this is directory will not be used at all, but
5+
the Dockerfile still needs succeed in it's COPY statement.
6+

0 commit comments

Comments
 (0)