Skip to content
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

sync tekton task "contracts" for builder tasks #38

Merged
merged 2 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crc-builder/oci/Containerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ RUN microdnf -y install git make gcc libvirt-devel perl-Digest-SHA xz findutils
&& chmod +x /usr/local/bin/mc \
&& rm /tmp/${GO_VERSION}.tar.gz

COPY lib/common.sh /usr/local/bin
COPY lib/linux/entrypoint.sh /usr/local/bin/entrypoint.sh

ENTRYPOINT entrypoint.sh
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