From 1484e087200841b44c2a1699e406a7f849beb705 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Wed, 25 Sep 2019 11:05:54 +0200 Subject: [PATCH 1/4] don't rebuild image in deploy stage --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f93aee..9cc2c87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,9 @@ stages: .deploy_template: extends: .build_template stage: deploy + timeout: 15m + script: + - echo "FROM $CI_REGISTRY/$CI_PROJECT_PATH/test/$CI_JOB_NAME-$CI_COMMIT_SHA" | /kaniko/executor --dockerfile /dev/stdin --destination $CI_REGISTRY/$CI_PROJECT_PATH/$CI_JOB_NAME only: - master - /[0-9]\..*/ From bb2606166cca64ced594a92a1d5dea01e53b88f1 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 26 Sep 2019 09:40:46 +0200 Subject: [PATCH 2/4] increase build timeout to 2 hours --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f93aee..52d5ec9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json script: - sh maintainer/docker_build.sh - timeout: 1h + timeout: 2h interruptible: true tags: - docker @@ -79,7 +79,6 @@ ubuntu-python3:cuda-9.0:build: extends: .build_template ubuntu-python3:cuda-10.1:build: extends: .build_template - timeout: 2h ubuntu:arm64:build: extends: - .build_template From 24c3a0c7abf581d9639e33333b4fa2d80e7b4d56 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 26 Sep 2019 10:02:08 +0200 Subject: [PATCH 3/4] silence boost build --- docker/intel-python3/Dockerfile-18 | 2 +- docker/ubuntu-python3/Dockerfile-min_boost | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/intel-python3/Dockerfile-18 b/docker/intel-python3/Dockerfile-18 index e768ddf..ad0688f 100644 --- a/docker/intel-python3/Dockerfile-18 +++ b/docker/intel-python3/Dockerfile-18 @@ -48,7 +48,7 @@ RUN cd /tmp \ && cd boost_1_66_0 \ && echo 'using mpi : mpiicpc ;' > tools/build/src/user-config.jam \ && ./bootstrap.sh \ - && ./b2 -j $(nproc) -d0 toolset=intel install --prefix=/opt/boost \ + && ./b2 -j $(nproc) -d0 warnings=off toolset=intel install --prefix=/opt/boost \ && cd \ && rm -r /tmp/boost diff --git a/docker/ubuntu-python3/Dockerfile-min_boost b/docker/ubuntu-python3/Dockerfile-min_boost index e95d2e1..0c4b410 100644 --- a/docker/ubuntu-python3/Dockerfile-min_boost +++ b/docker/ubuntu-python3/Dockerfile-min_boost @@ -33,7 +33,7 @@ RUN cd /tmp \ && cd boost_1_55_0 \ && ./bootstrap.sh \ && echo "using mpi ;" >> project-config.jam \ - && ./b2 -j $(nproc) install --prefix=/opt/boost \ + && ./b2 -j $(nproc) -d0 warnings=off install --prefix=/opt/boost \ && cd \ && rm -r /tmp/boost From 31eb7f5ec52aa924c1b19f6b1087b93a89a37d8b Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 26 Sep 2019 10:21:07 +0200 Subject: [PATCH 4/4] can now deploy from any runner --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cc2c87..9259260 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,9 @@ stages: timeout: 15m script: - echo "FROM $CI_REGISTRY/$CI_PROJECT_PATH/test/$CI_JOB_NAME-$CI_COMMIT_SHA" | /kaniko/executor --dockerfile /dev/stdin --destination $CI_REGISTRY/$CI_PROJECT_PATH/$CI_JOB_NAME + tags: + - docker + - linux only: - master - /[0-9]\..*/