Skip to content

Use DAOS_HTTPS_PROXY and DAOS_NO_PROXY #88

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

Open
grom72 wants to merge 3 commits into
base: master
Choose a base branch
from
+26 −7
Open

Use DAOS_HTTPS_PROXY and DAOS_NO_PROXY #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ceb2388
Use DAOS_HTTPS_PROXY and DAOS_NO_PROXY
grom72 Jul 22, 2025
7f555ca
curl relays on no_proxy environment variable
grom72 Jul 23, 2025
35ac0c2
redhat-lsb-core no longer supported by Fedora (42)
grom72 Jul 23, 2025
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
28 changes: 23 additions & 5 deletions Dockerfile.mockbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,37 @@ LABEL maintainer="daos@daos.groups.io"
ARG REPO_FILE_URL
ARG DAOS_LAB_CA_FILE_URL
ARG REPOSITORY_NAME

# Accept DAOS_NO_PROXY at build time
ARG DAOS_NO_PROXY
# Propagate into the build environment
ENV no_proxy=${DAOS_NO_PROXY}
ENV NO_PROXY=${DAOS_NO_PROXY}
# Persist into /etc/environment for use by shells and services
RUN echo "no_proxy=${DAOS_NO_PROXY}" >> /etc/environment && \
echo "NO_PROXY=${DAOS_NO_PROXY}" >> /etc/environment

# Accept DAOS_HTTPS_PROXY at build time
ARG DAOS_HTTPS_PROXY
# Propagate into the build environment
ENV https_proxy=${DAOS_HTTPS_PROXY}
ENV HTTPS_PROXY=${DAOS_HTTPS_PROXY}
# Persist into /etc/environment for use by shells and services
RUN echo "https_proxy=${DAOS_HTTPS_PROXY}" >> /etc/environment && \
echo "HTTPS_PROXY=${DAOS_HTTPS_PROXY}" >> /etc/environment

# script to install OS updates basic tools and daos dependencies
# COPY ./utils/scripts/install-fedora.sh /tmp/install.sh
# script to setup local repo if available
COPY ./packaging/scripts/repo-helper-fedora.sh /tmp/repo-helper.sh

RUN chmod +x /tmp/repo-helper.sh && \
/tmp/repo-helper.sh && \
RUN chmod +x /tmp/repo-helper.sh && \
/tmp/repo-helper.sh && \
rm -f /tmp/repo-helper.sh

# Install basic tools
RUN dnf -y install mock make \
rpm-build createrepo rpmlint redhat-lsb-core git \
python-srpm-macros rpmdevtools && \
RUN dnf -y install mock make rpm-build createrepo rpmlint git \
python-srpm-macros rpmdevtools && \
dnf -y clean all

# use same UID as host and default value of 1000 if not specified
Expand Down
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
// To use a test branch (i.e. PR) until it lands to master
// I.e. for testing library changes
//@Library(value="pipeline-lib@your_branch") _
@Library(value="pipeline-lib@grom72/sre-3215") _

String updatePackaging(String dir) {
return """rm -rf ${dir}/packaging/
Expand Down
4 changes: 2 additions & 2 deletions scripts/repo-helper-fedora.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ install_curl() {
install_optional_ca() {
ca_storage="/etc/pki/ca-trust/source/anchors/"
if [ -n "$DAOS_LAB_CA_FILE_URL" ]; then
curl -k --noproxy '*' -sSf -o "${ca_storage}lab_ca_file.crt" \
curl -k -sSf -o "${ca_storage}lab_ca_file.crt" \
"$DAOS_LAB_CA_FILE_URL"
update-ca-trust
fi
Expand All @@ -60,7 +60,7 @@ if [ -n "$REPO_FILE_URL" ]; then
install_optional_ca
mkdir -p /etc/yum.repos.d
pushd /etc/yum.repos.d/
curl -k --noproxy '*' -sSf \
curl -k -sSf \
-o "daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo" \
"{$REPO_FILE_URL}daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo"
disable_repos /etc/yum.repos.d/
Expand Down