From 96b85cef9727b520da65dbb0a2a3459a86a02006 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2016 12:51:06 +1000 Subject: [PATCH 01/13] Debugging gitlab runner --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab08d54..beca7ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,8 @@ services: before_script: - docker info - df +- find /etc/docker/ -print -exec ls -al {} \; +- id build: stage: build From 40ba388a84432c48e0a3247295181aed0d2f1b34 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2016 13:25:27 +1000 Subject: [PATCH 02/13] Debugging gitlab runner --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index beca7ba..cd2db10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,6 @@ before_script: build: stage: build script: - - docker build -t registry.leenooks.net/leenooks/base . + - docker build -t leenooks/base . + - docker tag leenooks/base registry.leenooks.net/leenooks/base - docker push registry.leenooks.net/leenooks/base From 003425943d0888a207b15bd0fc660973344af3b6 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2016 13:32:42 +1000 Subject: [PATCH 03/13] Debugging gitlab runner --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd2db10..a4a2003 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,8 @@ before_script: - df - find /etc/docker/ -print -exec ls -al {} \; - id +- env +- set build: stage: build From 3b0e35ce0211c0a1c349e0e939fbde44bc222f20 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2016 13:44:25 +1000 Subject: [PATCH 04/13] Debugging gitlab runner --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4a2003..473533a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,12 +5,20 @@ services: before_script: - docker info +- docker version - df - find /etc/docker/ -print -exec ls -al {} \; - id - env - set +- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.leenooks.net +test: + stage: test + script: + - docker build -t leenooks/base . + only: debug + build: stage: build script: From cd7958c9f338852162601c3ef4c0451f78f98f01 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2016 13:47:20 +1000 Subject: [PATCH 05/13] Debugging gitlab runner --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 473533a..1b39208 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,8 @@ test: stage: test script: - docker build -t leenooks/base . - only: debug + only: + - debug build: stage: build From 92bb4ae14e341065e06a6e78c9422fc4249b30b5 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2016 13:48:54 +1000 Subject: [PATCH 06/13] Debugging gitlab runner --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b39208..d640169 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ before_script: - id - env - set +- ps -Af - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.leenooks.net test: From 3152e3e2b8e004b3b26489cd2a3d9ff6f4c8e642 Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 4 Jul 2016 22:07:54 +1000 Subject: [PATCH 07/13] Using customer docker --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d640169..acbdfd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: docker:latest +image: ci-docker:latest services: - docker:dind From c63024aebfae9eec0aacd5a5dc13adbbd61378d5 Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 4 Jul 2016 22:17:08 +1000 Subject: [PATCH 08/13] Using customer docker --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acbdfd0..7170f3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ci-docker:latest +image: leenooks/ci-docker:latest services: - docker:dind From 7d4003ae3c7f7552b0e7814de48f4077e05790b6 Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 4 Jul 2016 22:27:43 +1000 Subject: [PATCH 09/13] Using customer docker --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7170f3f..e03a30a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: leenooks/ci-docker:latest services: -- docker:dind +- leenooks/ci-docker:dind before_script: - docker info From edbd9395150f0c6674fa200cc27e6d591a77a066 Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 4 Jul 2016 22:54:33 +1000 Subject: [PATCH 10/13] Using customer docker - more debugging --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e03a30a..3e75bf2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,14 +4,15 @@ services: - leenooks/ci-docker:dind before_script: -- docker info -- docker version +- env +- cat /etc/hosts +- ps -Af - df - find /etc/docker/ -print -exec ls -al {} \; - id -- env - set -- ps -Af +- docker info +- docker version - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.leenooks.net test: From a3f2a619d04a5d755af354de98c47be6d284893c Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 4 Jul 2016 23:32:01 +1000 Subject: [PATCH 11/13] Using customer docker - more debugging --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e75bf2..f576f83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ services: - leenooks/ci-docker:dind before_script: -- env +- env | sort - cat /etc/hosts - ps -Af - df From 621faec8ba9c63a300b999bcddfab151c1712daa Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 7 Jul 2016 22:07:49 +1000 Subject: [PATCH 12/13] Testing with variables --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f576f83..ad19157 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,28 +3,28 @@ image: leenooks/ci-docker:latest services: - leenooks/ci-docker:dind +variables: + REGISTRY=registry.leenooks.net + IMAGE=leenooks/base + before_script: -- env | sort -- cat /etc/hosts -- ps -Af -- df -- find /etc/docker/ -print -exec ls -al {} \; -- id -- set +- env|sort - docker info - docker version -- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.leenooks.net +- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${REGISTRY} test: stage: test script: - - docker build -t leenooks/base . + - docker build -t ${IMAGE} . only: - debug build: stage: build script: - - docker build -t leenooks/base . - - docker tag leenooks/base registry.leenooks.net/leenooks/base - - docker push registry.leenooks.net/leenooks/base + - docker build -t ${IMAGE} . + - docker tag ${IMAGE} ${REGISTRY}/${IMAGE} + - docker push ${REGISTRY}/${IMAGE} + tags: + - docker From 9fcc8d418a10ac1d74947197a8468f25bd3baa25 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 7 Jul 2016 22:10:17 +1000 Subject: [PATCH 13/13] Updated .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad19157..b9cce21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ services: - leenooks/ci-docker:dind variables: - REGISTRY=registry.leenooks.net - IMAGE=leenooks/base + REGISTRY: registry.leenooks.net + IMAGE: leenooks/base before_script: - env|sort