Skip to content

Commit 7fcd47b

Browse files
committed
fix container ENV
1 parent 68c805a commit 7fcd47b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

docker/kayobe/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
# NOTE: Currently supported images:
44
# quay.io/rockylinux/rockylinux:8
55
# rockylinux:9
6-
ENV PIP_CERT=/etc/pki/tls/certs/ca-bundle.trust.crt
7-
ENV HTTP_PROXY=http://192.168.121.250:3127
8-
ENV HTTPS_PROXY=http://192.168.121.250:3127
9-
ENV NO_PROXY=localhost,127.0.0.1,10.1.1.1,192.168.121.111,192.168.124.111,192.168.121.112,192.168.124.112,192.168.121.113,192.168.124.113,192.168.121.114,192.168.124.114,192.168.121.115,192.168.124.115,192.168.121.116,192.168.121.25,192.168.124.116,192.168.121.117,192.168.124.117,192.168.121.118,192.168.124.118,192.168.121.250,192.168.121.253,192.168.121.254,192.168.121.11,192.168.121.12,192.168.121.13,192.168.121.16,192.168.121.31,192.168.121.33,192.168.121.34,192.168.121.36,192.168.121.37,192.168.121.23,192.168.121.24,192.168.123.15,192.168.123.16,192.168.123.17,192.168.123.18,192.168.123.19,192.168.123.20,192.168.123.21,192.168.123.22,192.168.134.11,192.168.134.12,192.168.134.13,192.168.134.14,192.168.134.15,192.168.134.16,192.168.134.17,192.168.134.18,192.168.134.10,192.168.123.249,10.69.176.85,dashboard.pengu-cloud.cymru.nhs.uk,identity.pengu-cloud.cymru.nhs.uk,image.pengu-cloud.cymru.nhs.uk,compute.pengu-cloud.cymru.nhs.uk,vnc.pengu-cloud.cymru.nhs.uk,block-storage.pengu-cloud.cymru.nhs.uk,network.pengu-cloud.cymru.nhs.uk,key-manager.pengu-cloud.cymru.nhs.uk,placement.pengu-cloud.cymru.nhs.uk,opensearch-dashboards.pengu-cloud.cymru.nhs.uk,alertmanager.pengu-cloud.cymru.nhs.uk,grafana.pengu-cloud.cymru.nhs.uk,load-balancer.pengu-cloud.cymru.nhs.uk
10-
ENV http_proxy=http://192.168.121.250:3127
11-
ENV https_proxy=http://192.168.121.250:3127
12-
ENV no_proxy=localhost,127.0.0.1,10.1.1.1,192.168.121.111,192.168.124.111,192.168.121.112,192.168.124.112,192.168.121.113,192.168.124.113,192.168.121.114,192.168.124.114,192.168.121.115,192.168.124.115,192.168.121.116,192.168.121.25,192.168.124.116,192.168.121.117,192.168.124.117,192.168.121.118,192.168.124.118,192.168.121.250,192.168.121.253,192.168.121.254,192.168.121.11,192.168.121.12,192.168.121.13,192.168.121.16,192.168.121.31,192.168.121.33,192.168.121.34,192.168.121.36,192.168.121.37,192.168.121.23,192.168.121.24,192.168.123.15,192.168.123.16,192.168.123.17,192.168.123.18,192.168.123.19,192.168.123.20,192.168.123.21,192.168.123.22,192.168.134.11,192.168.134.12,192.168.134.13,192.168.134.14,192.168.134.15,192.168.134.16,192.168.134.17,192.168.134.18,192.168.134.10,192.168.123.249,10.69.176.85,dashboard.pengu-cloud.cymru.nhs.uk,identity.pengu-cloud.cymru.nhs.uk,image.pengu-cloud.cymru.nhs.uk,compute.pengu-cloud.cymru.nhs.uk,vnc.pengu-cloud.cymru.nhs.uk,block-storage.pengu-cloud.cymru.nhs.uk,network.pengu-cloud.cymru.nhs.uk,key-manager.pengu-cloud.cymru.nhs.uk,placement.pengu-cloud.cymru.nhs.uk,opensearch-dashboards.pengu-cloud.cymru.nhs.uk,alertmanager.pengu-cloud.cymru.nhs.uk,grafana.pengu-cloud.cymru.nhs.uk,load-balancer.pengu-cloud.cymru.nhs.uk
13-
146
ARG BASE_IMAGE="quay.io/rockylinux/rockylinux:8"
157
FROM ${BASE_IMAGE}
168
LABEL maintainer="Will Szumski [email protected]"
@@ -22,6 +14,14 @@ ARG KAYOBE_DOCKER_SSH_CONFIG_PATH=".automation/docker/kayobe/ssh_config"
2214
ARG KAYOBE_DOCKER_PIP_CONFIG_PATH=".automation/docker/kayobe/pip.conf"
2315

2416
ENV container docker
17+
ENV PIP_CERT=/etc/pki/tls/certs/ca-bundle.trust.crt
18+
ENV HTTP_PROXY=http://192.168.121.250:3127
19+
ENV HTTPS_PROXY=http://192.168.121.250:3127
20+
ENV NO_PROXY=localhost,127.0.0.1,10.1.1.1,192.168.121.111,192.168.124.111,192.168.121.112,192.168.124.112,192.168.121.113,192.168.124.113,192.168.121.114,192.168.124.114,192.168.121.115,192.168.124.115,192.168.121.116,192.168.121.25,192.168.124.116,192.168.121.117,192.168.124.117,192.168.121.118,192.168.124.118,192.168.121.250,192.168.121.253,192.168.121.254,192.168.121.11,192.168.121.12,192.168.121.13,192.168.121.16,192.168.121.31,192.168.121.33,192.168.121.34,192.168.121.36,192.168.121.37,192.168.121.23,192.168.121.24,192.168.123.15,192.168.123.16,192.168.123.17,192.168.123.18,192.168.123.19,192.168.123.20,192.168.123.21,192.168.123.22,192.168.134.11,192.168.134.12,192.168.134.13,192.168.134.14,192.168.134.15,192.168.134.16,192.168.134.17,192.168.134.18,192.168.134.10,192.168.123.249,10.69.176.85,dashboard.pengu-cloud.cymru.nhs.uk,identity.pengu-cloud.cymru.nhs.uk,image.pengu-cloud.cymru.nhs.uk,compute.pengu-cloud.cymru.nhs.uk,vnc.pengu-cloud.cymru.nhs.uk,block-storage.pengu-cloud.cymru.nhs.uk,network.pengu-cloud.cymru.nhs.uk,key-manager.pengu-cloud.cymru.nhs.uk,placement.pengu-cloud.cymru.nhs.uk,opensearch-dashboards.pengu-cloud.cymru.nhs.uk,alertmanager.pengu-cloud.cymru.nhs.uk,grafana.pengu-cloud.cymru.nhs.uk,load-balancer.pengu-cloud.cymru.nhs.uk
21+
ENV http_proxy=http://192.168.121.250:3127
22+
ENV https_proxy=http://192.168.121.250:3127
23+
ENV no_proxy=localhost,127.0.0.1,10.1.1.1,192.168.121.111,192.168.124.111,192.168.121.112,192.168.124.112,192.168.121.113,192.168.124.113,192.168.121.114,192.168.124.114,192.168.121.115,192.168.124.115,192.168.121.116,192.168.121.25,192.168.124.116,192.168.121.117,192.168.124.117,192.168.121.118,192.168.124.118,192.168.121.250,192.168.121.253,192.168.121.254,192.168.121.11,192.168.121.12,192.168.121.13,192.168.121.16,192.168.121.31,192.168.121.33,192.168.121.34,192.168.121.36,192.168.121.37,192.168.121.23,192.168.121.24,192.168.123.15,192.168.123.16,192.168.123.17,192.168.123.18,192.168.123.19,192.168.123.20,192.168.123.21,192.168.123.22,192.168.134.11,192.168.134.12,192.168.134.13,192.168.134.14,192.168.134.15,192.168.134.16,192.168.134.17,192.168.134.18,192.168.134.10,192.168.123.249,10.69.176.85,dashboard.pengu-cloud.cymru.nhs.uk,identity.pengu-cloud.cymru.nhs.uk,image.pengu-cloud.cymru.nhs.uk,compute.pengu-cloud.cymru.nhs.uk,vnc.pengu-cloud.cymru.nhs.uk,block-storage.pengu-cloud.cymru.nhs.uk,network.pengu-cloud.cymru.nhs.uk,key-manager.pengu-cloud.cymru.nhs.uk,placement.pengu-cloud.cymru.nhs.uk,opensearch-dashboards.pengu-cloud.cymru.nhs.uk,alertmanager.pengu-cloud.cymru.nhs.uk,grafana.pengu-cloud.cymru.nhs.uk,load-balancer.pengu-cloud.cymru.nhs.uk
24+
2525
# NOTE: systemd requires privileged container
2626
# RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
2727
# systemd-tmpfiles-setup.service ] || rm -f $i; done); \

0 commit comments

Comments
 (0)