Skip to content
Open
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
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# syntax=docker/dockerfile:1

FROM quay.io/pypa/manylinux_2_28_aarch64
ARG QUAY_MIRROR=quay.io
FROM ${QUAY_MIRROR}/pypa/manylinux_2_28_aarch64

WORKDIR /root

ARG ALMALINUX_MIRROR
RUN if [ -n "${ALMALINUX_MIRROR}" ]; then \
sed -i -e 's|^mirrorlist=|#mirrorlist=|g' \
-e "s|^# baseurl=https://repo.almalinux.org|baseurl=https://${ALMALINUX_MIRROR}|g" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just in case the maintainers decide to use different amount of spaces? it might never happen though

Suggested change
-e "s|^# baseurl=https://repo.almalinux.org|baseurl=https://${ALMALINUX_MIRROR}|g" \
-e "s|^#[[:space:]]*baseurl=https://repo.almalinux.org|baseurl=https://${ALMALINUX_MIRROR}|g" \

/etc/yum.repos.d/almalinux*.repo; \
fi

RUN mkdir -p ./tools/scripts/lib_install
COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,18 @@ component_root="${script_dir}/../../../"
build_cmd=(
docker buildx build
--platform linux/arm64
--build-arg "ALMALINUX_MIRROR=${ALMALINUX_MIRROR:-}"
--build-arg "QUAY_MIRROR=${QUAY_MIRROR:-quay.io}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may not need this -quay.io fallback given we have specified so in the Dockerfile?

--tag clp-core-dependencies-aarch64-manylinux_2_28:dev
"$component_root"
--file "${script_dir}/Dockerfile"
--load
)

if [[ "${USE_NETWORK_HOST:-}" == "true" ]]; then
build_cmd+=(--network=host)
fi

if command -v git >/dev/null && git -C "$script_dir" rev-parse --is-inside-work-tree >/dev/null ;
then
build_cmd+=(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# syntax=docker/dockerfile:1

FROM quay.io/pypa/manylinux_2_28_x86_64
ARG QUAY_MIRROR=quay.io
FROM ${QUAY_MIRROR}/pypa/manylinux_2_28_x86_64

WORKDIR /root

ARG ALMALINUX_MIRROR
RUN if [ -n "${ALMALINUX_MIRROR}" ]; then \
sed -i -e 's|^mirrorlist=|#mirrorlist=|g' \
-e "s|^# baseurl=https://repo.almalinux.org|baseurl=https://${ALMALINUX_MIRROR}|g" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-e "s|^# baseurl=https://repo.almalinux.org|baseurl=https://${ALMALINUX_MIRROR}|g" \
-e "s|^#[[:space:]]*baseurl=https://repo.almalinux.org|baseurl=https://${ALMALINUX_MIRROR}|g" \

/etc/yum.repos.d/almalinux*.repo; \
fi

RUN mkdir -p ./tools/scripts/lib_install
COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,18 @@ component_root="${script_dir}/../../../"
build_cmd=(
docker buildx build
--platform linux/amd64
--build-arg "ALMALINUX_MIRROR=${ALMALINUX_MIRROR:-}"
--build-arg "QUAY_MIRROR=${QUAY_MIRROR:-quay.io}"
--tag clp-core-dependencies-x86-manylinux_2_28:dev
"$component_root"
--file "${script_dir}/Dockerfile"
--load
)

if [[ "${USE_NETWORK_HOST:-}" == "true" ]]; then
build_cmd+=(--network=host)
fi

if command -v git >/dev/null && git -C "$script_dir" rev-parse --is-inside-work-tree >/dev/null ;
then
build_cmd+=(
Expand Down
Loading