-
Notifications
You must be signed in to change notification settings - Fork 84
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
Podvm builder version removal #2008
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,15 +12,13 @@ ARG ARCH="amd64" | |
ARG YQ_ARCH="amd64" | ||
# PROTOC_ARCH="x86_64" | "s390_64" | ||
ARG PROTOC_ARCH="x86_64" | ||
ARG GO_VERSION="1.22.7" | ||
ARG PROTOC_VERSION="3.15.0" | ||
ARG RUST_VERSION="1.75.0" | ||
ARG YQ_VERSION="v4.35.1" | ||
ARG PACKER_VERSION="v1.9.4" | ||
# amd64: YQ_CHECKSUM="sha256:bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08" | ||
# s390x: YQ_CHECKSUM="sha256:4e6324d08630e7df733894a11830412a43703682d65a76f1fc925aac08268a45" | ||
ARG YQ_CHECKSUM="sha256:bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08" | ||
ARG GO_VERSION | ||
ARG PROTOC_VERSION | ||
ARG RUST_VERSION | ||
ARG PACKER_VERSION | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you need ENV setting for PACKER_VERSION later in the code? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure if it's strictly required as that seems to be GHA related and I don't see us ever building RHEL in the open-source pipelines, but I can add for consistency |
||
ARG ORAS_VERSION | ||
ARG YQ_VERSION | ||
ARG YQ_CHECKSUM | ||
ARG ORG_ID | ||
ARG ACTIVATION_KEY | ||
|
||
|
@@ -33,6 +31,7 @@ ENV ARCH=${ARCH} | |
ENV YQ_ARCH=${YQ_ARCH} | ||
ENV YQ_VERSION=${YQ_VERSION} | ||
ENV ORAS_VERSION=${ORAS_VERSION} | ||
ENV PACKER_VERSION=${PACKER_VERSION} | ||
|
||
# This registering RHEL when building on an unsubscribed system | ||
# If you are running a UBI container on a registered and subscribed RHEL host, the main RHEL Server repository is enabled inside the standard UBI container | ||
|
@@ -55,7 +54,7 @@ RUN chmod a+x /usr/local/bin/yq && \ | |
rm -f go${GO_VERSION}.linux-${YQ_ARCH}.tar.gz | ||
ENV PATH="/usr/local/go/bin:${PATH}" | ||
|
||
# Install packer. Packer doesn't does not have prebuilt s390x arch binaries above Packer version 0.1.5 | ||
# Install packer. Packer doesn't have prebuilt s390x arch binaries beyond Packer version 0.1.5 | ||
RUN if [ "${ARCH}" == "s390x" ]; then \ | ||
git clone --depth 1 --single-branch https://github.com/hashicorp/packer.git -b ${PACKER_VERSION}; \ | ||
cd packer; \ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PACKER_VERSION ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok.. I see it's only needed for rhel