From ec4b92823a6b6f65102c29acb404d4b79d8c377c Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Thu, 19 Sep 2019 16:55:48 +0700
Subject: [PATCH 1/5] Try fixing CI build process
---
.gitlab-ci.yml | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6693dd9..e725b54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,13 @@
---
image: docker:19
+services:
+ - name: docker:19-dind
+ entrypoint: ["env", "-u", "DOCKER_HOST"]
+ command: ["dockerd-entrypoint.sh"]
+variables:
+ DOCKER_HOST: tcp://docker:2375/
+ DOCKER_DRIVER: overlay2
+
stages:
- test
- deploy
@@ -14,6 +22,17 @@ SonarScanner Analysis:
only:
- master
+Test Publish:
+ stage: test
+ before_script:
+ - chmod +x build.sh
+ script:
+ - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD docker.io
+ - ./build.sh $IMAGE_NAMESPACE
+ allow_failure: true
+ tags:
+ - docker
+
Publish to Docker Hub:
stage: deploy
before_script:
@@ -27,4 +46,4 @@ Publish to Docker Hub:
tags:
- docker
only:
- - master
\ No newline at end of file
+ - master
--
GitLab
From 47ef92809e8761e11c8c2ad97bb31078b215794e Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Thu, 19 Sep 2019 17:13:16 +0700
Subject: [PATCH 2/5] Put Docker build statement into GitLab CI/CD
configuration
---
.gitlab-ci.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e725b54..d413197 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,10 @@ Test Publish:
- chmod +x build.sh
script:
- docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD docker.io
- - ./build.sh $IMAGE_NAMESPACE
+ - docker build
+ --build-arg=IMAGE_CREATED="$(date --utc -Iseconds)"
+ --tag $IMAGE_NAMESPACE/sonar-scanner-cli:latest
+ .
allow_failure: true
tags:
- docker
--
GitLab
From d6ea31d1ed59106ae9b93bfd43d8a964418ea8aa Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Thu, 19 Sep 2019 17:17:05 +0700
Subject: [PATCH 3/5] Fix GitLab CI/CD configuration
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d413197..b707ab7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
---
image: docker:19
+
services:
- name: docker:19-dind
entrypoint: ["env", "-u", "DOCKER_HOST"]
@@ -7,6 +8,7 @@ services:
variables:
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
+ DOCKER_TLS_CERTDIR: ""
stages:
- test
--
GitLab
From c681c379f204c88d75f6977187113366808b109b Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Thu, 19 Sep 2019 17:22:27 +0700
Subject: [PATCH 4/5] Update GitLab CI/CD
---
.gitlab-ci.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b707ab7..0f21e34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
---
-image: docker:19
+image: docker:19-git
services:
- name: docker:19-dind
@@ -26,12 +26,11 @@ SonarScanner Analysis:
Test Publish:
stage: test
- before_script:
- - chmod +x build.sh
script:
- - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD docker.io
+ - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
- docker build
--build-arg=IMAGE_CREATED="$(date --utc -Iseconds)"
+ --build-arg=IMAGE_REVISION="$(git show --pretty=oneline | tac | tail -n 1 | awk '{print $1}')"
--tag $IMAGE_NAMESPACE/sonar-scanner-cli:latest
.
allow_failure: true
--
GitLab
From d1efb3bc479af584b69134e47f52b8e7dc97dde3 Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Thu, 19 Sep 2019 17:27:46 +0700
Subject: [PATCH 5/5] Fix GitLab CI/CD for building Docker image
---
.gitlab-ci.yml | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f21e34..bc76d49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
---
image: docker:19-git
+# Quickhack based on https://forum.gitlab.com/t/docker-dind-stops-working-after-12-1-0-update/28664/2
services:
- name: docker:19-dind
entrypoint: ["env", "-u", "DOCKER_HOST"]
@@ -24,27 +25,14 @@ SonarScanner Analysis:
only:
- master
-Test Publish:
- stage: test
+Publish to Docker Hub:
+ stage: deploy
script:
- docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
- docker build
--build-arg=IMAGE_CREATED="$(date --utc -Iseconds)"
--build-arg=IMAGE_REVISION="$(git show --pretty=oneline | tac | tail -n 1 | awk '{print $1}')"
- --tag $IMAGE_NAMESPACE/sonar-scanner-cli:latest
- .
- allow_failure: true
- tags:
- - docker
-
-Publish to Docker Hub:
- stage: deploy
- before_script:
- - chmod +x build.sh
- script:
- - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD docker.io
- - ./build.sh $IMAGE_NAMESPACE
- - docker push "$IMAGE_NAMESPACE/sonar-scanner-cli:latest"
+ --tag $IMAGE_NAMESPACE/sonar-scanner-cli:latest .
when: manual
allow_failure: true
tags:
--
GitLab