From 73d16aa3e59e161e282aed241c87836078de3fae Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Mon, 30 Oct 2023 15:53:09 +0100 Subject: [PATCH] Add proxy environment to allow install packages with yum from conan --- README.md | 8 +------- conan-el6-gcc44-x86/Dockerfile | 1 + conan-el6-gcc44-x86/docker-compose.yml | 3 ++- conan-el6-gcc44/Dockerfile | 1 + conan-el6-gcc44/docker-compose.yml | 3 ++- conan-el6-gcc73-x86/Dockerfile | 1 + conan-el6-gcc73-x86/docker-compose.yml | 3 ++- conan-el6-gcc73/Dockerfile | 1 + conan-el6-gcc73/docker-compose.yml | 3 ++- conan-el6-gcc83-x86/Dockerfile | 1 + conan-el6-gcc83-x86/docker-compose.yml | 3 ++- conan-el6-gcc83/Dockerfile | 1 + conan-el6-gcc83/docker-compose.yml | 3 ++- conan-el6-gcc91-x86/Dockerfile | 1 + conan-el6-gcc91-x86/docker-compose.yml | 3 ++- conan-el6-gcc91/Dockerfile | 1 + conan-el6-gcc91/docker-compose.yml | 3 ++- conan-el7-gcc48-x86/Dockerfile | 1 + conan-el7-gcc48-x86/docker-compose.yml | 3 ++- conan-el7-gcc48/Dockerfile | 1 + conan-el7-gcc48/docker-compose.yml | 3 ++- conan-el7-gcc73-x86/Dockerfile | 1 + conan-el7-gcc73-x86/docker-compose.yml | 3 ++- conan-el7-gcc73/Dockerfile | 1 + conan-el7-gcc73/docker-compose.yml | 3 ++- conan-el7-gcc82-x86/Dockerfile | 1 + conan-el7-gcc82-x86/docker-compose.yml | 3 ++- conan-el7-gcc83/Dockerfile | 1 + conan-el7-gcc83/docker-compose.yml | 3 ++- conan-el7-gcc93-x86/Dockerfile | 1 + conan-el7-gcc93-x86/docker-compose.yml | 3 ++- conan-el7-gcc93/Dockerfile | 1 + conan-el7-gcc93/docker-compose.yml | 3 ++- environment | 5 +++++ 34 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 environment diff --git a/README.md b/README.md index bcf43e7..54eb18a 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,7 @@ All images include: ### To build one image ``` -docker-compose build conan-el6-gcc44 -``` - -### To build all images - -``` -$ docker-compose build +docker-compose -f conan-el6-gcc44\docker-compose.yml build ``` ### To build an image manually without docker-compose diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 82a62d4..f66f9af 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd 1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc44-x86/docker-compose.yml b/conan-el6-gcc44-x86/docker-compose.yml index 621578e..d9099f1 100644 --- a/conan-el6-gcc44-x86/docker-compose.yml +++ b/conan-el6-gcc44-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc44-x86: build: - context: . + context: .. + dockerfile: conan-el6-gcc44-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 38a1826..e7dc370 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc44/docker-compose.yml b/conan-el6-gcc44/docker-compose.yml index 8a86343..b699f20 100644 --- a/conan-el6-gcc44/docker-compose.yml +++ b/conan-el6-gcc44/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc44: build: - context: . + context: .. + dockerfile: conan-el6-gcc44/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 56d873f..ae51ae2 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd 1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc73-x86/docker-compose.yml b/conan-el6-gcc73-x86/docker-compose.yml index fbfbfd8..e94d692 100644 --- a/conan-el6-gcc73-x86/docker-compose.yml +++ b/conan-el6-gcc73-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc73-x86: build: - context: . + context: .. + dockerfile: conan-el6-gcc73-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index 6b993bc..9915356 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc73/docker-compose.yml b/conan-el6-gcc73/docker-compose.yml index 60090db..102a0f9 100644 --- a/conan-el6-gcc73/docker-compose.yml +++ b/conan-el6-gcc73/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc73: build: - context: . + context: .. + dockerfile: conan-el6-gcc73/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 304cb36..d028e01 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd 1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc83-x86/docker-compose.yml b/conan-el6-gcc83-x86/docker-compose.yml index a935614..758c04b 100644 --- a/conan-el6-gcc83-x86/docker-compose.yml +++ b/conan-el6-gcc83-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc83-x86: build: - context: . + context: .. + dockerfile: conan-el6-gcc83-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index c4674b8..2c4fe52 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc83/docker-compose.yml b/conan-el6-gcc83/docker-compose.yml index 8ee4e26..e0a6e4c 100644 --- a/conan-el6-gcc83/docker-compose.yml +++ b/conan-el6-gcc83/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc83: build: - context: . + context: .. + dockerfile: conan-el6-gcc83/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index af870dc..d67ab87 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd 1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc91-x86/docker-compose.yml b/conan-el6-gcc91-x86/docker-compose.yml index 5319a08..d30837b 100644 --- a/conan-el6-gcc91-x86/docker-compose.yml +++ b/conan-el6-gcc91-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc91-x86: build: - context: . + context: .. + dockerfile: conan-el6-gcc91-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 08227b8..109559a 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd 1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el6-gcc91/docker-compose.yml b/conan-el6-gcc91/docker-compose.yml index 63a2276..004f083 100644 --- a/conan-el6-gcc91/docker-compose.yml +++ b/conan-el6-gcc91/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el6-gcc91: build: - context: . + context: .. + dockerfile: conan-el6-gcc91/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index b12022c..bb1ac4e 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd g1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc48-x86/docker-compose.yml b/conan-el7-gcc48-x86/docker-compose.yml index e2de865..12e86aa 100644 --- a/conan-el7-gcc48-x86/docker-compose.yml +++ b/conan-el7-gcc48-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc48-x86: build: - context: . + context: .. + dockerfile: conan-el7-gcc48-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index ee2c924..ad30f39 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc48/docker-compose.yml b/conan-el7-gcc48/docker-compose.yml index acc8c9b..8f349ad 100644 --- a/conan-el7-gcc48/docker-compose.yml +++ b/conan-el7-gcc48/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc48: build: - context: . + context: .. + dockerfile: conan-el7-gcc48/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index a0275c0..2cdd612 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd g1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc73-x86/docker-compose.yml b/conan-el7-gcc73-x86/docker-compose.yml index 3428348..7c68d26 100644 --- a/conan-el7-gcc73-x86/docker-compose.yml +++ b/conan-el7-gcc73-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc73-x86: build: - context: . + context: .. + dockerfile: conan-el7-gcc73-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index c174832..2749dcc 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc73/docker-compose.yml b/conan-el7-gcc73/docker-compose.yml index 486996e..d662cbd 100644 --- a/conan-el7-gcc73/docker-compose.yml +++ b/conan-el7-gcc73/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc73: build: - context: . + context: .. + dockerfile: conan-el7-gcc73/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index 9b3f645..a2637b6 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd g1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc82-x86/docker-compose.yml b/conan-el7-gcc82-x86/docker-compose.yml index 8c065b7..94e274d 100644 --- a/conan-el7-gcc82-x86/docker-compose.yml +++ b/conan-el7-gcc82-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc82-x86: build: - context: . + context: .. + dockerfile: conan-el7-gcc82-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index 8ea2163..91612af 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc83/docker-compose.yml b/conan-el7-gcc83/docker-compose.yml index 975686a..5975d0e 100644 --- a/conan-el7-gcc83/docker-compose.yml +++ b/conan-el7-gcc83/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc83: build: - context: . + context: .. + dockerfile: conan-el7-gcc83/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index ffefb7d..febca7a 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -55,6 +55,7 @@ RUN groupadd g1001 -g 1001 \ && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc93-x86/docker-compose.yml b/conan-el7-gcc93-x86/docker-compose.yml index c293428..8c018ef 100644 --- a/conan-el7-gcc93-x86/docker-compose.yml +++ b/conan-el7-gcc93-x86/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc93-x86: build: - context: . + context: .. + dockerfile: conan-el7-gcc93-x86/Dockerfile args: - http_proxy - https_proxy diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index a583548..9105586 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -54,6 +54,7 @@ RUN groupadd g1001 -g 1001 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && chmod +x ${DEVTOOLS_ROOT}/bin/* +COPY environment /etc/environment USER conan WORKDIR /home/conan diff --git a/conan-el7-gcc93/docker-compose.yml b/conan-el7-gcc93/docker-compose.yml index 222af55..3108814 100644 --- a/conan-el7-gcc93/docker-compose.yml +++ b/conan-el7-gcc93/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.8" services: conan-el7-gcc93: build: - context: . + context: .. + dockerfile: conan-el7-gcc93/Dockerfile args: - http_proxy - https_proxy diff --git a/environment b/environment new file mode 100644 index 0000000..51d2c67 --- /dev/null +++ b/environment @@ -0,0 +1,5 @@ +http_proxy=http://proxy.synchrotron-soleil.fr:8080 +https_proxy=http://proxy.synchrotron-soleil.fr:8080 +HTTP_PROXY=http://proxy.synchrotron-soleil.fr:8080 +HTTPS_PROXY=http://proxy.synchrotron-soleil.fr:8080 +no_proxy=127.0.0.1,localhost,::1,controlforge.synchrotron-soleil.fr \ No newline at end of file -- GitLab