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

DAOS-16754 build: Add support for http proxy #15404

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
6 changes: 6 additions & 0 deletions ci/docker/Dockerfile.maldet.el.8
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
ARG BASE_DISTRO=rockylinux/rockylinux:8
FROM $BASE_DISTRO
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

# Needed for later use of BASE_DISTRO
ARG BASE_DISTRO

Expand Down
6 changes: 6 additions & 0 deletions ci/docker/Dockerfile.maldet.leap.15
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ FROM $BASE_DISTRO
ARG BASE_DISTRO
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Intermittent cache-bust. Used to reduce load on the actual CB1 later.
ARG CB0

Expand Down
6 changes: 6 additions & 0 deletions docs/QSG/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ environment variables allow to customize the Docker image to build:
(default "")
- `DAOS_VERSION`: Version of DAOS to use (default "2.4.1-2.el8")
- `DAOS_AUTH`: Enable DAOS authentication when set to "yes" (default "yes")
- `HTTP_PROXY`: HTTP used during image building (default "")
- `HTTP_PROXY`: HTTPS used during image building (default "")
- `NO_PROXY`: comma-separated list of addresses for which the proxy should not be used (default "")

When the environment file has been properly filled, run the following command to build the base DAOS
docker image.
Expand Down Expand Up @@ -119,6 +122,9 @@ The `daos-server` image is also using the following environment variables:
- `DAOS_BDEV_SIZE`: Size in GB of the file created to emulate NVMe devices (default 16)
- `DAOS_IFACE_NAME`: Fabric network interface used by the DAOS engine (default "eth0")
- `DAOS_MD_ON_SSD`: Enable DAOS MD-on-SSD feature when set to "yes" (default "no")
- `HTTP_PROXY`: HTTP used during image building (default "")
- `HTTP_PROXY`: HTTPS used during image building (default "")
- `NO_PROXY`: comma-separated list of addresses for which the proxy should not be used (default "")

!!! note
The IP address of the network interface referenced by the `DAOS_IFACE_NAME` argument will be
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/Dockerfile.code_scanning
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
FROM fedora:latest
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Intermittent cache-bust. Used to reduce load on the actual CACHEBUST later.
ARG CB0

Expand Down
6 changes: 6 additions & 0 deletions utils/docker/Dockerfile.el.8
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ ARG POINT_RELEASE=
ARG BASE_DISTRO=rockylinux/rockylinux:8$POINT_RELEASE
FROM $BASE_DISTRO as basic
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

# Needed for later use of BASE_DISTRO
ARG BASE_DISTRO

Expand Down
6 changes: 6 additions & 0 deletions utils/docker/Dockerfile.el.9
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ ARG POINT_RELEASE=
ARG BASE_DISTRO=almalinux:9$POINT_RELEASE
FROM $BASE_DISTRO as basic
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

# Needed for later use of BASE_DISTRO
ARG BASE_DISTRO

Expand Down
6 changes: 6 additions & 0 deletions utils/docker/Dockerfile.leap.15
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ ARG POINT_RELEASE=
ARG BASE_DISTRO=registry.opensuse.org/opensuse/leap-dnf:15$POINT_RELEASE
FROM $BASE_DISTRO as basic
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY

# Needed for later use of BASE_DISTRO
ARG BASE_DISTRO

Expand Down
6 changes: 6 additions & 0 deletions utils/docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ ARG BASE_DISTRO=ubuntu:22.04
FROM $BASE_DISTRO
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Intermittent cache-bust. Used to reduce load on the actual CB1 later.
ARG CB0

Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-admin/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "$DAOS_DOCKER_IMAGE_NSP/daos-base-$LINUX_DISTRO:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-agent/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "$DAOS_DOCKER_IMAGE_NSP/daos-base-$LINUX_DISTRO:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-base/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ ARG LINUX_IMAGE_TAG=""
FROM "$LINUX_IMAGE_NAME:$LINUX_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Base configuration of dnf and system update
RUN dnf clean all && \
dnf makecache && \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-client/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "$DAOS_DOCKER_IMAGE_NSP/daos-base-$LINUX_DISTRO:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install base DAOS package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-client_agent/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "$DAOS_DOCKER_IMAGE_NSP/daos-agent-$LINUX_DISTRO:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install base DAOS package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-server/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "$DAOS_DOCKER_IMAGE_NSP/daos-base-$LINUX_DISTRO:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/daos-spdk_setup/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "$DAOS_DOCKER_IMAGE_NSP/daos-base-$LINUX_DISTRO:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
3 changes: 3 additions & 0 deletions utils/docker/examples/docker-compose.admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ services:
- "DAOS_DOCKER_IMAGE_NSP=${DAOS_DOCKER_IMAGE_NSP}"
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
tty: true
secrets:
- source: daos_admin-certs
Expand Down
3 changes: 3 additions & 0 deletions utils/docker/examples/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ services:
- "DAOS_GPG_KEYS=${DAOS_GPG_KEYS}"
- "DAOS_REPOS_NOAUTH=${DAOS_REPOS_NOAUTH}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
tty: true
3 changes: 3 additions & 0 deletions utils/docker/examples/docker-compose.client_bm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ services:
- "DAOS_DOCKER_IMAGE_NSP=${DAOS_DOCKER_IMAGE_NSP}"
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
tty: true
network_mode: host
pid: host
Expand Down
3 changes: 3 additions & 0 deletions utils/docker/examples/docker-compose.client_gt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ services:
- "DAOS_VERSION=${DAOS_VERSION}"
- "DAOS_CLIENT_UNAME=${DAOS_CLIENT_UNAME}"
- "DAOS_CLIENT_GNAME=${DAOS_CLIENT_GNAME}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
tty: true
network_mode: host
cap_add:
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/examples/docker-compose.client_sa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ services:
- "DAOS_DOCKER_IMAGE_NSP=${DAOS_DOCKER_IMAGE_NSP}"
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
network_mode: host
pid: host
volumes:
Expand All @@ -37,6 +40,9 @@ services:
- "DAOS_DOCKER_IMAGE_NSP=${DAOS_DOCKER_IMAGE_NSP}"
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
tty: true
network_mode: host
pid: host
Expand Down
3 changes: 3 additions & 0 deletions utils/docker/examples/docker-compose.server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ services:
- "DAOS_DOCKER_IMAGE_NSP=${DAOS_DOCKER_IMAGE_NSP}"
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
# XXX Seems to not be possible to use uio without privileged mode
# https://github.com/moby/moby/issues/22825
privileged: true
Expand Down
3 changes: 3 additions & 0 deletions utils/docker/examples/docker-compose.spdk_setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ services:
- "DAOS_DOCKER_IMAGE_NSP=${DAOS_DOCKER_IMAGE_NSP}"
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
# XXX Seems to not be possible to use uio without privileged mode
# https://github.com/moby/moby/issues/22825
privileged: true
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/vcluster/daos-admin/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "${DAOS_DOCKER_IMAGE_NSP}/daos-base-${LINUX_DISTRO}:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS client package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/vcluster/daos-base/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ ARG LINUX_IMAGE_TAG=""
FROM $LINUX_IMAGE_NAME:$LINUX_IMAGE_TAG
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Base configuration of dnf and system update
RUN dnf clean all && \
dnf makecache && \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/vcluster/daos-client/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "${DAOS_DOCKER_IMAGE_NSP}/daos-base-${LINUX_DISTRO}:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS client package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
6 changes: 6 additions & 0 deletions utils/docker/vcluster/daos-server/el8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ ARG DAOS_DOCKER_IMAGE_TAG=""
FROM "${DAOS_DOCKER_IMAGE_NSP}/daos-base-${LINUX_DISTRO}:$DAOS_DOCKER_IMAGE_TAG"
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Install DAOS server package
ARG DAOS_VERSION=""
RUN for it in DAOS_VERSION ; do \
Expand Down
12 changes: 12 additions & 0 deletions utils/docker/vcluster/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ services:
- "DAOS_REPOS_NOAUTH=${DAOS_REPOS_NOAUTH}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "DAOS_AUTH=${DAOS_AUTH}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
privileged: true
cgroup: host
volumes:
Expand All @@ -45,6 +48,9 @@ services:
- "DAOS_SCM_SIZE=${DAOS_SCM_SIZE}"
- "DAOS_BDEV_SIZE=${DAOS_BDEV_SIZE}"
- "DAOS_MD_ON_SSD=${DAOS_MD_ON_SSD}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
container_name: daos-server
hostname: daos-server
privileged: true
Expand Down Expand Up @@ -87,6 +93,9 @@ services:
- "DAOS_DOCKER_IMAGE_TAG=${DAOS_DOCKER_IMAGE_TAG}"
- "DAOS_VERSION=${DAOS_VERSION}"
- "DAOS_AUTH=${DAOS_AUTH}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
container_name: daos-admin
hostname: daos-admin
privileged: true
Expand Down Expand Up @@ -123,6 +132,9 @@ services:
- "DAOS_AGENT_IFACE_NUMA_NODE=${DAOS_AGENT_IFACE_NUMA_NODE}"
- "DAOS_AGENT_IFACE_NAME=${DAOS_AGENT_IFACE_NAME}"
- "DAOS_AGENT_IFACE_DOMAIN_NAME=${DAOS_AGENT_IFACE_DOMAIN_NAME}"
- "HTTP_PROXY=${HTTP_PROXY:-${http_proxy:-\"\"}}"
- "HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy:-\"\"}}"
- "NO_PROXY=${NO_PROXY:-${no_proxy:-\"\"}}"
container_name: daos-client
hostname: daos-client
privileged: true
Expand Down
6 changes: 6 additions & 0 deletions utils/rpms/packaging/Dockerfile.centos.7
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
FROM centos:centos7
LABEL maintainer="[email protected]"

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# Use local repo server if present
ARG REPO_FILE_URL
RUN set -e; \
Expand Down
6 changes: 6 additions & 0 deletions utils/rpms/packaging/Dockerfile.coverity
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
FROM fedora:latest
MAINTAINER daos-stack <[email protected]>

# Set environment variables for proxy
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY


# use same UID as host and default value of 1000 if not specified
ARG UID=1000

Expand Down
Loading