From f5fd473b3bba7f2f24eac0013f902290505f6019 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sun, 10 Jan 2021 17:16:41 +0300 Subject: [PATCH 1/5] Fuck. Downgrade DinD. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 955109b..b2bd3c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM docker:dind +FROM docker:18.09.7-dind ENV LANG C.UTF-8 -- GitLab From 07dca3a9932c92929ef970ebb6a6a37d2fd33396 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sun, 10 Jan 2021 17:17:14 +0300 Subject: [PATCH 2/5] - --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afb7f5c..14757be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ test: services: - "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" script: - - drr registry.cyberbrain.pw/docker/hello-world || true + - drr registry.cyberbrain.pw/docker/hello-world ########################################################################################################## -- GitLab From 7f975e5ce908f5c9a0ca27a0c1232fd4369c996b Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sun, 10 Jan 2021 17:18:34 +0300 Subject: [PATCH 3/5] temp fixes --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14757be..e949bf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ check: variables: GIT_DEPTH: 1 services: - - registry.cyberbrain.pw/docker/dind + - docker:18.09.7-dind script: - drr registry.cyberbrain.pw/tools/linters/hadolint hadolint --ignore DL3007 Dockerfile -- GitLab From f3e3145a751ea19b90740b2248931aabbe58cdfc Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sun, 10 Jan 2021 17:21:02 +0300 Subject: [PATCH 4/5] temp fixes 2 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e949bf0..972f3c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ build: variables: GIT_DEPTH: 1 services: - - registry.cyberbrain.pw/docker/dind + - docker:18.09.7-dind script: - docker pull "${CI_REGISTRY_IMAGE}:latest" || true - docker build --cache-from "${CI_REGISTRY_IMAGE}:latest" -t "${CI_REGISTRY_IMAGE}:temp-${CI_PIPELINE_IID}" -f ./Dockerfile . @@ -73,7 +73,7 @@ release: variables: GIT_STRATEGY: "none" services: - - registry.cyberbrain.pw/docker/dind + - docker:18.09.7-dind only: - /^trunk$/ - /^staging$/ -- GitLab From d21494bca7199969a69ef991b5d3641ff1942320 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sun, 10 Jan 2021 17:24:28 +0300 Subject: [PATCH 5/5] temp fixes 3 --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 972f3c7..14757be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ check: variables: GIT_DEPTH: 1 services: - - docker:18.09.7-dind + - registry.cyberbrain.pw/docker/dind script: - drr registry.cyberbrain.pw/tools/linters/hadolint hadolint --ignore DL3007 Dockerfile @@ -45,7 +45,7 @@ build: variables: GIT_DEPTH: 1 services: - - docker:18.09.7-dind + - registry.cyberbrain.pw/docker/dind script: - docker pull "${CI_REGISTRY_IMAGE}:latest" || true - docker build --cache-from "${CI_REGISTRY_IMAGE}:latest" -t "${CI_REGISTRY_IMAGE}:temp-${CI_PIPELINE_IID}" -f ./Dockerfile . @@ -73,7 +73,7 @@ release: variables: GIT_STRATEGY: "none" services: - - docker:18.09.7-dind + - registry.cyberbrain.pw/docker/dind only: - /^trunk$/ - /^staging$/ -- GitLab