Skip to content

Commit

Permalink
chore: migrate crc-builder-installer strategy to deliverest
Browse files Browse the repository at this point in the history
The current stratgy for crc-builder-installer had its own logic to run the builder scripts remotely. That logic was created before deliverest exists, as now we prefer to maintain it only from one project this commit remove legacy logic and move to use deliverest as base to run scripts remotely

Signed-off-by: Adrian Riobo <[email protected]>
  • Loading branch information
adrianriobo committed Oct 23, 2024
1 parent 4eb78ab commit 717d6e2
Show file tree
Hide file tree
Showing 9 changed files with 276 additions and 454 deletions.
23 changes: 10 additions & 13 deletions crc-builder/oci/Containerfile.non-linux
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,23 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal as preparer
ARG OS
ENV OS ${OS}

COPY lib/${OS}/builder/* /usr/local/crc-builder/
COPY lib/${OS}/entrypoint.sh /usr/local/bin/entrypoint.sh

RUN cd /usr/local/crc-builder && \
RUN cd /tmp && \
if [[ ${OS} == 'windows' ]]; then \
curl -k -LO https://dl.minio.io/client/mc/release/windows-amd64/mc.exe; \
else \
curl -k -LO https://dl.min.io/client/mc/release/darwin-amd64/mc; \
chmod +x mc; \
fi;

#v0.0.6
FROM quay.io/rhqp/deliverest@sha256:016f766cac1bb644e1415b1ebb34504394ba0806d52679a55a0ef1162edabb47

FROM quay.io/rhqp/support-tools:v0.0.2

LABEL org.opencontainers.image.authors="CodeReady Containers <[email protected]>"
LABEL org.opencontainers.image.authors="CRCQE <[email protected]>"

ENV PLATFORM ${PLATFORM}
ENV BUILDER_RESOURCES "/usr/local/crc-builder"
ARG OS

COPY --from=preparer /usr/local/crc-builder ${BUILDER_RESOURCES}
COPY --from=preparer /usr/local/bin/entrypoint.sh /usr/local/bin
COPY lib/common.sh /usr/local/bin
ENV ASSETS_FOLDER=/opt/crc-builder \
OS=${OS}

ENTRYPOINT entrypoint.sh
COPY --from=preparer /tmp/* ${ASSETS_FOLDER}/
COPY lib/${OS}/* ${ASSETS_FOLDER}/
83 changes: 0 additions & 83 deletions crc-builder/oci/lib/common.sh

This file was deleted.

109 changes: 0 additions & 109 deletions crc-builder/oci/lib/darwin/builder/build.sh

This file was deleted.

57 changes: 0 additions & 57 deletions crc-builder/oci/lib/darwin/entrypoint.sh

This file was deleted.

Loading

0 comments on commit 717d6e2

Please sign in to comment.