Skip to content

Commit 2e6ef0c

Browse files
committed
add pip.conf file for copy
1 parent be4cffc commit 2e6ef0c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

docker/kayobe/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ LABEL maintainer="Will Szumski [email protected]"
1111
# control host bootstrap.
1212
ARG KAYOBE_ENVIRONMENT=""
1313
ARG KAYOBE_DOCKER_SSH_CONFIG_PATH=".automation/docker/kayobe/ssh_config"
14+
ARG KAYOBE_DOCKER_PIP_CONFIG_PATH=".automation/docker/kayobe/pip.conf"
1415

1516
ENV container docker
1617
# NOTE: systemd requires privileged container
@@ -92,13 +93,7 @@ RUN echo "[global]" >> /stack/.pip/pip.conf && \
9293
# echo " files.pythonhosted.org" >> /etc/pip.conf
9394
# echo " releases.openstack.org" >> /etc/pip.conf
9495

95-
RUN tee /etc/pip.conf > /dev/null <<EOF
96-
[global]
97-
trusted-host = pypi.python.org
98-
pypi.org
99-
files.pythonhosted.org
100-
releases.openstack.org
101-
EOF
96+
COPY $KAYOBE_DOCKER_PIP_CONFIG_PATH /etc/pip.conf
10297

10398
RUN mkdir /stack/.ssh && chmod 700 /stack/.ssh
10499
COPY --chown=stack:stack $KAYOBE_DOCKER_SSH_CONFIG_PATH /stack/.ssh/config

docker/kayobe/pip.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[global]
2+
trusted-host = pypi.python.org
3+
pypi.org
4+
files.pythonhosted.org
5+
releases.openstack.org

0 commit comments

Comments
 (0)