diff --git a/apps/assisted-disconnected-ui/Containerfile b/apps/assisted-disconnected-ui/Containerfile index 6e3969f964..8a89c1f719 100644 --- a/apps/assisted-disconnected-ui/Containerfile +++ b/apps/assisted-disconnected-ui/Containerfile @@ -10,7 +10,7 @@ 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.access.redhat.com/ubi9/go-toolset:1.21 as proxy-build +FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as proxy-build WORKDIR /app COPY apps/assisted-disconnected-ui/proxy /app USER 0 diff --git a/apps/assisted-disconnected-ui/Containerfile.ocp b/apps/assisted-disconnected-ui/Containerfile.ocp new file mode 100644 index 0000000000..4afbd33942 --- /dev/null +++ b/apps/assisted-disconnected-ui/Containerfile.ocp @@ -0,0 +1,24 @@ +FROM registry.ci.openshift.org/edge-infrastructure/nodejs-18-minimal:latest as ui-build +USER root +RUN microdnf install -y rsync git + +WORKDIR /app +COPY --chown=1001:0 / /app +RUN ls /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 +WORKDIR /app +COPY apps/assisted-disconnected-ui/proxy /app +USER 0 +RUN go build + +FROM registry.ci.openshift.org/ocp/ubi-micro:9 +COPY --from=ui-build /app/apps/assisted-disconnected-ui/build /app/proxy/dist +COPY --from=proxy-build /app/assisted-disconnected-ui /app/proxy +WORKDIR /app/proxy +EXPOSE 8080 +CMD ./assisted-disconnected-ui diff --git a/apps/assisted-disconnected-ui/proxy/go.mod b/apps/assisted-disconnected-ui/proxy/go.mod index dcda9fd5c1..d1e6f2e50d 100644 --- a/apps/assisted-disconnected-ui/proxy/go.mod +++ b/apps/assisted-disconnected-ui/proxy/go.mod @@ -1,6 +1,6 @@ module github.com/openshift-assisted/assisted-disconnected-ui -go 1.21 +go 1.22 require ( github.com/gorilla/mux v1.8.1