-
Notifications
You must be signed in to change notification settings - Fork 63
OCPBUGS-61953: Update dependency sourcing to remote #3155
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-bot
merged 1 commit into
openshift-assisted:master
from
pawanpinjarkar:update-dockerfile-to-provide-dependencies-from-remote-source
Sep 24, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,42 @@ | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.19 AS ui-build | ||
| USER root | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.20 AS ui-build | ||
| USER 0 | ||
|
|
||
| WORKDIR /app | ||
| COPY --chown=1001:0 / /app | ||
| RUN ls /app | ||
| COPY --chown=1001:0 . /app | ||
| ENV NODE_OPTIONS='--max-old-space-size=8192' | ||
| RUN git config --global --add safe.directory /app | ||
| RUN npm install -g corepack@0.24.1 | ||
| RUN yarn install --immutable && yarn build:all | ||
|
|
||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 as proxy-build | ||
| # The REMOTE_SOURCES value is set by the build system to indicate the location of the cachito-backed artifacts cache. | ||
| ARG REMOTE_SOURCES | ||
| ARG REMOTE_SOURCES_DIR=/remote-sources | ||
| COPY ${REMOTE_SOURCES} ${REMOTE_SOURCES_DIR} | ||
|
|
||
| ARG YARN_VERSION=3.4.1 | ||
|
|
||
| # bootstrap yarn so we can install and run the other tools. | ||
| RUN CACHED_YARN=./artifacts/${YARN_VERSION}.tar.gz; \ | ||
| if [ -f ${CACHED_YARN} ]; then \ | ||
| # use dependencies provided by Cachito | ||
| npm install -g ${CACHED_YARN}; \ | ||
| yarn install --immutable && yarn build:all; \ | ||
| else \ | ||
| # For local builds | ||
| npm install -g corepack@0.24.1; \ | ||
| corepack enable; \ | ||
| corepack prepare yarn@${YARN_VERSION} --activate; \ | ||
| yarn install --immutable && yarn build:all; \ | ||
| fi | ||
|
|
||
| FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as proxy-build | ||
| WORKDIR /app | ||
| COPY apps/assisted-disconnected-ui/proxy /app | ||
| USER 0 | ||
| RUN go build | ||
| # Build using vendored deps as build system does not have internet access | ||
| RUN export GOFLAGS="-mod=vendor"; go build | ||
|
|
||
| FROM registry.ci.openshift.org/ocp/ubi-micro:9 | ||
| FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 | ||
| COPY --from=ui-build /app/apps/assisted-disconnected-ui/build /app/proxy/dist | ||
| COPY --from=proxy-build /app/assisted-disconnected-ui /app/proxy | ||
celdrake marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| WORKDIR /app/proxy | ||
| EXPOSE 8080 | ||
| CMD ./assisted-disconnected-ui | ||
| CMD ./assisted-disconnected-ui | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.