From f996bf63436bd4fb621c453f146174af7d8baea0 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Wed, 8 May 2024 05:30:46 -0700 Subject: [PATCH] chore: RHIDP-1502 fix path to packages/app/src/build-metadata.json in downstream; simplify destination for copy (#1241) Signed-off-by: Nick Boldt --- .rhdh/docker/Dockerfile | 4 ++-- docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.rhdh/docker/Dockerfile b/.rhdh/docker/Dockerfile index afc667941d..2d7da2b511 100644 --- a/.rhdh/docker/Dockerfile +++ b/.rhdh/docker/Dockerfile @@ -210,8 +210,8 @@ COPY --from=build --chown=1001:1001 $REMOTE_SOURCES_DIR/ ./ # Downstream only - copy embedded dynamic plugins from $REMOTE_SOURCES_DIR COPY --from=build $REMOTE_SOURCES_DIR/dynamic-plugins/dist/ ./dynamic-plugins/dist/ -# store a copy of the build metadata in the final container -COPY --from=build $CONTAINER_SOURCE/packages/app/src/build-metadata.json /opt/app-root/src/ +# Downstream only - store a copy of the build metadata from $REMOTE_SOURCES_DIR in the final container +COPY --from=build $REMOTE_SOURCES_DIR/packages/app/src/build-metadata.json . # Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions COPY docker/install-dynamic-plugins.py docker/install-dynamic-plugins.sh ./ diff --git a/docker/Dockerfile b/docker/Dockerfile index ab1c886d1e..6f09e558ae 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -119,8 +119,8 @@ COPY --from=cleanup --chown=1001:1001 $CONTAINER_SOURCE/ ./ # Upstream only - copy embedded dynamic plugins from $CONTAINER_SOURCE COPY --from=build $CONTAINER_SOURCE/dynamic-plugins/dist/ ./dynamic-plugins/dist/ -# store a copy of the build metadata in the final container -COPY --from=build $CONTAINER_SOURCE/packages/app/src/build-metadata.json /opt/app-root/src/ +# Upstream only - store a copy of the build metadata from $CONTAINER_SOURCE in the final container +COPY --from=build $CONTAINER_SOURCE/packages/app/src/build-metadata.json . # Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions COPY docker/install-dynamic-plugins.py docker/install-dynamic-plugins.sh ./