Skip to content

Commit

Permalink
chore: RHIDP-1502 fix path to packages/app/src/build-metadata.json in…
Browse files Browse the repository at this point in the history
… downstream; simplify destination for copy (#1241)

Signed-off-by: Nick Boldt <nboldt@redhat.com>
  • Loading branch information
nickboldt committed May 8, 2024
1 parent c330b87 commit f996bf6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./
Expand Down

0 comments on commit f996bf6

Please sign in to comment.