Skip to content

OCPBUGS-44889: Allow external configuration of download host for production builds #46

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.

Sign up for GitHub

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
merged 1 commit into from
Dec 12, 2024
Merged

OCPBUGS-44889: Allow external configuration of download host for production builds #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.ci.openshift.org/ocp/4.18:installer AS builder

ARG DIRECT_DOWNLOAD=false
ENV ISO_HOST=https://releases-rhcos-art.apps.ocp-virt.prod.psi.redhat.com

USER root:root

Expand Down
4 changes: 2 additions & 2 deletions fetch_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ download_url() {
local iso_sha256
iso_sha256="$(image_data "${arch}" sha256)"

wget "$@" "${url}" -O "${iso_file}"
wget --quiet "$@" "${url}" -O "${iso_file}"
local actual_sha256
actual_sha256="$(sha256sum "${iso_file}" | cut -d' ' -f1)"
if [ "${actual_sha256}" != "${iso_sha256}" ]; then
Expand All @@ -45,7 +45,7 @@ download_art_arch() {

local origurl
origurl="$(image_data "${arch}" location)"
local url="https://releases-rhcos-art.apps.ocp-virt.prod.psi.redhat.com/${origurl#*.com/art/}"
local url="$ISO_HOST/${origurl#*.com/art/}"

download_url "${arch}" "${url}" --no-check-certificate # skipping certificate check is ok because we will check its sha256 in any case.
}
Expand Down