diff --git a/README.md b/README.md index bcf43e7e66c3dffbc27ffd8a2caf2f238c5e64bd..54eb18a1e7e4c6d046bc53e597a558dfe71af65e 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 82a62d4548b0279816e08210c7a5ef397e575911..f66f9af5b7e587c0501c88d0455e7183f9ac3d58 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 621578efeb2da077f10b1bfd33482c8bfa4ad631..d9099f102adc7a91dccba9248ece12fcf62fc77e 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 38a18267271dc3d081b9fcfdf44176cb5d367fc4..e7dc3701aa1da82ec11464643072d89dbce0e797 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 8a86343788e42f6df852072cd45babe26bd7ef68..b699f2023ccd697fde9374b488af001ec6153bf5 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 56d873fa3bcc9b541f328e7974562fd02ca7460a..ae51ae26b67be23846ced285acab17986b0419bd 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 fbfbfd85adb79f73d4120bc32d8df511eb239d2b..e94d6922a00c20ee90b7073f0ba24c53ae521308 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 6b993bce0d313de4af593510c0595ea07e500c09..99153565a181b47a4ba8a6cd0c02cd0b5126c3ac 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 60090db8d5f6a06d8845391fcbbabe77becfcddd..102a0f9715f5b5554cf3f2ec20b9756bb72137ea 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 304cb36f9cadd32f83011151ff951c109f237de8..d028e01f2f2e5f5faafc2ad16234d55e440aa3f1 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 a935614e73199962738707fe7bf51e66bb1ee226..758c04b40fa6fa5a705bba7049ea54661311fe9b 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 c4674b86f8d8d656a58955b5c8ac39c3f2a01f65..2c4fe526429e6dd50a5f12dc44087d2ee00c12a3 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 8ee4e260fc0b727ea691bb03d8bac35b0ae1f378..e0a6e4c29df7cb78d26ea0cbcf04ab42ae1d0245 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 af870dc6218051fe4eef2e3965029845454d9347..d67ab87dc8c879c69c1b5750c56d9366f94e829f 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 5319a081aed9de70664841e249ae9d0876aa95aa..d30837bf2438bf58432d1a4b6bba42ed38b0ba83 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 08227b803b4836086ec434769a3de4efb39135db..109559aff565d00ce4f41e61d1a52b121f165a47 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 63a22766083e5d48d5fc6ce86a135f61a43a3901..004f083a7218a260c8f3f494146568ab0d6f99ff 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 b12022c4eea833a69ad5525ea09e6d48afa81d7a..bb1ac4e0c56f52df181bc7185f08e90ec2145069 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 e2de8659ad9f6a527f63ccb968fc0db067fdb290..12e86aa42046808eb23fe775cfed6f2ff12598bd 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 ee2c9244454b8f1b3cd427a35c441097eaae5346..ad30f39b686f48fa7f1c9d07062ec6f88e3b3816 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 acc8c9bae9bd883ea77e78dc51cc951486e2156b..8f349adf77191dc503c63dd1374fcdee69b619b9 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 a0275c001152f457d084fe3c89109c436b52d329..2cdd612217bcd8247c892bc4ea474e2bbcce742b 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 3428348f2198b9c6d8472c390399b995c9a3064d..7c68d267d9af57d0bcc0abad803c71f47329e9c6 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 c174832aacfa1f425a57233aaab952d1a060696a..2749dcc0f6ed67c8eab42a5bfd8df097857470d0 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 486996e025ef13a2d475c78b5b7619792ff979da..d662cbd70904df758f2243d2cb523c31b79f46a3 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 9b3f6456d8c6669c5f2d029adb67f8ac752505ae..a2637b68b4005bf3d73a71f32c2897f00f6478c5 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 8c065b70a0e3c88396810a0ae94eafb67276ffa8..94e274d8a6c913a752eb15701d34fdc753f93659 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 8ea21635851fa195d8604b84296ddb17c75af3f3..91612af7a5251a7d32aa7579e26a4a12059dee97 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 975686abc370621760ec30dc3f7425a7d7ca6f7b..5975d0e73aee1ece4aefd21853e98f07c9c42b1a 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 ffefb7d61a37f00664b2eaa90bfbd2e31ca54208..febca7a67e58987b21f148dbeffcd80928dcdadb 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 c293428705d15519b5fea29927a40d5c4dcac2ad..8c018efc6821f47f0ae4de6daebec368216dbfe2 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 a583548b56943c8559d267ed492b08214844767c..910558655b8deaecba769fa705eed0921353b666 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 222af55d44ce0b930e3d38083e3e4e5931441dd8..3108814a915b6f07ff3626fe9d840559b1e3896d 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 0000000000000000000000000000000000000000..51d2c67497502724fcd3cb13c7fe85ba7b2c329a --- /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