From 976aeb6bc54e9a6c81d3f888724ed366ce7e1925 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 14:46:21 +0200 Subject: [PATCH 01/50] WIP automatic builds --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..c0fae38 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +docker-build: + image: docker:19.03-dind + stage: build + services: + - docker:dind + script: + - cd sdk + - ./run.sh -b -- GitLab From 12d1ed681ebd4e5c0f9bbe1ec20314e5f19ff092 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 14:51:23 +0200 Subject: [PATCH 02/50] Update .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 c0fae38..7b03343 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ docker-build: - image: docker:19.03-dind + image: docker:19.03-dind-rootless stage: build services: - - docker:dind + - docker:19.03-dind-rootless script: - cd sdk - ./run.sh -b -- GitLab From 267304ea42bc8f3433642d993a333526a35c6f25 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:01:33 +0200 Subject: [PATCH 03/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b03343..b78f265 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,8 @@ docker-build: image: docker:19.03-dind-rootless stage: build + tags: + - docker services: - docker:19.03-dind-rootless script: -- GitLab From deda2629bc349175fd9ec5f7b715d3b1c7722547 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:20:21 +0200 Subject: [PATCH 04/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b78f265..85d8f35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,5 +6,4 @@ docker-build: services: - docker:19.03-dind-rootless script: - - cd sdk - - ./run.sh -b + - cd sdk && ./run.sh -b -- GitLab From 2ce8728734503f120bf685832f3ea74ff82479fc Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:21:38 +0200 Subject: [PATCH 05/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85d8f35..aa004fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,4 +6,4 @@ docker-build: services: - docker:19.03-dind-rootless script: - - cd sdk && ./run.sh -b + - ls && cd sdk && ls && ./run.sh -b -- GitLab From d360f9f426053fd4f5dc6763ed9b4bbfdee53301 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:21:49 +0200 Subject: [PATCH 06/50] Update .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 aa004fa..32ce4e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build tags: - docker - services: - - docker:19.03-dind-rootless + #services: + # - docker:19.03-dind-rootless script: - ls && cd sdk && ls && ./run.sh -b -- GitLab From 89572931d0b75b75ff2becd56ea78ba4672e99a1 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:23:31 +0200 Subject: [PATCH 07/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32ce4e1..4f42b4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,4 +6,7 @@ docker-build: #services: # - docker:19.03-dind-rootless script: - - ls && cd sdk && ls && ./run.sh -b + - ls -l + - cd sdk + - ls + - bash ./run.sh -b -- GitLab From a0975a984a75044c3e6dd208c7bea253d60a3621 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:24:30 +0200 Subject: [PATCH 08/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f42b4b..0974f85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,5 +8,6 @@ docker-build: script: - ls -l - cd sdk - - ls + - ls -l + - docker - bash ./run.sh -b -- GitLab From 25eab1ced667c783bd7ed7fd36c885071a920746 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:26:11 +0200 Subject: [PATCH 09/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0974f85..4a52757 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,4 +10,5 @@ docker-build: - cd sdk - ls -l - docker + - apk add bash - bash ./run.sh -b -- GitLab From 1b9c5636db1255f9d1a3be124073b89c1ec375c8 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:28:11 +0200 Subject: [PATCH 10/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a52757..1596bef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,9 @@ docker-build: #services: # - docker:19.03-dind-rootless script: - - ls -l + #- ls -l - cd sdk - - ls -l - - docker - - apk add bash - - bash ./run.sh -b + #- ls -l + #- docker + #- apk add bash + - sh ./run.sh -b -- GitLab From ce97e6018ffd403e984867b3afa8dad1311c336b Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:35:22 +0200 Subject: [PATCH 11/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1596bef..39db08e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ docker-build: image: docker:19.03-dind-rootless + entrypoint: ['sh', '-c', 'exec su root -c sh'] stage: build tags: - docker -- GitLab From 5365406cd362ae7712ccf01e27dba4f58d74146f Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:37:04 +0200 Subject: [PATCH 12/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39db08e..f8f455a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ docker-build: - image: docker:19.03-dind-rootless - entrypoint: ['sh', '-c', 'exec su root -c sh'] + #image: docker:19.03-dind-rootless + image: docker:19.03-dind + #entrypoint: ['sh', '-c', 'exec su root -c sh'] stage: build tags: - docker -- GitLab From 95395654f30d3bb2839c55735b50a6023bfd91a6 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:37:33 +0200 Subject: [PATCH 13/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8f455a..3f45276 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,5 @@ docker-build: - cd sdk #- ls -l #- docker - #- apk add bash + - apk add bash - sh ./run.sh -b -- GitLab From fb219f2c4c3c7265e11da6befbcccd119548d403 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:38:06 +0200 Subject: [PATCH 14/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f45276..71914c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,5 @@ docker-build: #- ls -l #- docker - apk add bash - - sh ./run.sh -b + - apk add sudo + - bash ./run.sh -b -- GitLab From d9a5290daa62bbd534c938d1ced58c1ad2566a39 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:38:55 +0200 Subject: [PATCH 15/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71914c1..68fbb40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,4 +14,5 @@ docker-build: #- docker - apk add bash - apk add sudo + - docker - bash ./run.sh -b -- GitLab From c0300949dd2705d80ee8703cae663c91971a0499 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:39:30 +0200 Subject: [PATCH 16/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68fbb40..ba87f67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,5 +14,5 @@ docker-build: #- docker - apk add bash - apk add sudo - - docker + - docker images - bash ./run.sh -b -- GitLab From 46bacbdb2cec3cbad2c4f88625ad7f01f34ba68f Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:47:06 +0200 Subject: [PATCH 17/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba87f67..478441f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ docker-build: - cd sdk #- ls -l #- docker - - apk add bash - - apk add sudo - - docker images + #- apk add bash + #- apk add sudo + - docker build -t mi_sphere_sdk . - bash ./run.sh -b -- GitLab From 3fc94dbf848c1178a901eace66e696793a6c2bf4 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:51:03 +0200 Subject: [PATCH 18/50] Update .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 478441f..4701db0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ docker-build: - #image: docker:19.03-dind-rootless - image: docker:19.03-dind + image: docker:19.03-dind-rootless + #image: docker:19.03-dind #entrypoint: ['sh', '-c', 'exec su root -c sh'] stage: build tags: -- GitLab From c22ba7c828768ed408aae831e430cf151a34f2ce Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:53:32 +0200 Subject: [PATCH 19/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4701db0..05226bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,5 +14,6 @@ docker-build: #- docker #- apk add bash #- apk add sudo + - export DOCKER_HOST="${HOSTNAME}-docker" - docker build -t mi_sphere_sdk . - bash ./run.sh -b -- GitLab From a60da07aa6cd91bab19e7548d3005abec9a2cb31 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:56:56 +0200 Subject: [PATCH 20/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05226bc..0ee9571 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,6 @@ docker-build: #- docker #- apk add bash #- apk add sudo - - export DOCKER_HOST="${HOSTNAME}-docker" + - export DOCKER_HOST="localhost" - docker build -t mi_sphere_sdk . - bash ./run.sh -b -- GitLab From a7fdb5adc96aacc2c2bd35b5d8b3e9007d4201c5 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 15:57:35 +0200 Subject: [PATCH 21/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ee9571..d9f9791 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ docker-build: #- docker #- apk add bash #- apk add sudo + - ps aux - export DOCKER_HOST="localhost" - docker build -t mi_sphere_sdk . - bash ./run.sh -b -- GitLab From 5a644812773f788c8eb95db52757b6837a2aeeed Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 16:03:14 +0200 Subject: [PATCH 22/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9f9791..11f15b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ docker-build: # - docker:19.03-dind-rootless script: #- ls -l + - ./dockerd-entrypoint.sh - cd sdk #- ls -l #- docker -- GitLab From 56d51715365f15497a51985829925cc55702be8f Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 16:03:58 +0200 Subject: [PATCH 23/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11f15b9..74efdef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ docker-build: # - docker:19.03-dind-rootless script: #- ls -l - - ./dockerd-entrypoint.sh + - /usr/local/bin/dockerd-entrypoint.sh - cd sdk #- ls -l #- docker -- GitLab From ab362fe688909ea6fb04107df4065d4812421fd6 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 17:07:54 +0200 Subject: [PATCH 24/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74efdef..ebdee9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,9 @@ -docker-build: - image: docker:19.03-dind-rootless - #image: docker:19.03-dind - #entrypoint: ['sh', '-c', 'exec su root -c sh'] - stage: build +build-container: + image: docker:19.03-dind + stage: build-container tags: - docker - #services: - # - docker:19.03-dind-rootless script: - #- ls -l - - /usr/local/bin/dockerd-entrypoint.sh - cd sdk - #- ls -l - #- docker - #- apk add bash - #- apk add sudo - - ps aux - - export DOCKER_HOST="localhost" - docker build -t mi_sphere_sdk . - - bash ./run.sh -b + -- GitLab From 3bebb3dba8e724aff7b03e4a18f0c3b4336848c1 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 17:08:42 +0200 Subject: [PATCH 25/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebdee9e..c754775 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ build-container: image: docker:19.03-dind - stage: build-container + stage: .pre tags: - docker script: -- GitLab From 9754a430d59dea231dc670838d2822afe2128a02 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 17:09:19 +0200 Subject: [PATCH 26/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c754775..317bf7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ build-container: image: docker:19.03-dind - stage: .pre + stage: pre tags: - docker script: -- GitLab From 8031e4093ca0dc281a56b365d0c5d63aa0e178b8 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 17:09:44 +0200 Subject: [PATCH 27/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 317bf7a..c754775 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ build-container: image: docker:19.03-dind - stage: pre + stage: .pre tags: - docker script: -- GitLab From e000aba32e8e627516ad1dfe0145b9113562ab32 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 17:11:56 +0200 Subject: [PATCH 28/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c754775..60dd6e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,16 @@ build-container: image: docker:19.03-dind stage: .pre tags: - - docker + - docker script: - cd sdk - docker build -t mi_sphere_sdk . - + - docker push # TODO + +build: + image: mi_sphere_sdk:latest + stage: build + tags: + - docker + script: + - echo TOOD -- GitLab From 5f94a5f930c2258797b3482474427aeb1cb962a6 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 19:52:44 +0200 Subject: [PATCH 29/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60dd6e9..49bad16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,5 @@ -build-container: - image: docker:19.03-dind - stage: .pre - tags: - - docker - script: - - cd sdk - - docker build -t mi_sphere_sdk . - - docker push # TODO - build: - image: mi_sphere_sdk:latest stage: build - tags: - - docker script: - - echo TOOD + - echo "test" + - id -- GitLab From 5d150191f86e6edcf8f7adeceac14048e6a8d740 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 19:55:49 +0200 Subject: [PATCH 30/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49bad16..a31e82f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ build: stage: build + tags: + - linux script: - echo "test" - id -- GitLab From 83094f61ac96ab8f45dcbe5675515c7b683b5bf4 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 20:12:52 +0200 Subject: [PATCH 31/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a31e82f..f62d102 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,5 +3,6 @@ build: tags: - linux script: - - echo "test" - - id + - cd sdk + - ls -l + - ./run.sh -b -- GitLab From 2ee6f26d0aa61d23bceee39038cd937a2797992a Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 20:13:43 +0200 Subject: [PATCH 32/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f62d102..d7337c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,4 +5,5 @@ build: script: - cd sdk - ls -l - - ./run.sh -b + #- ./run.sh -b + - docker build -t a . -- GitLab From d88c34af6883bae01811c7b37850876e6d7354b3 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 20:14:53 +0200 Subject: [PATCH 33/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7337c9..bf1d3a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,4 +6,5 @@ build: - cd sdk - ls -l #- ./run.sh -b + - set - docker build -t a . -- GitLab From 8f3bd2cbd5b413149ce8c7d18d9aad822de9bfa8 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 20:18:33 +0200 Subject: [PATCH 34/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf1d3a1..0d46bae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ build: tags: - linux script: + - cd + - . .bashrc - cd sdk - ls -l #- ./run.sh -b -- GitLab From edfdd15dd48742de4e350c42cfb9226b1cadca85 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Mon, 27 Jul 2020 20:19:05 +0200 Subject: [PATCH 35/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d46bae..bbd4df7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,7 @@ build: tags: - linux script: - - cd - - . .bashrc + - . "$HOME"/.bashrc - cd sdk - ls -l #- ./run.sh -b -- GitLab From 274dfc1cbac4844b842f524ce582ee81433f526c Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:40:12 +0200 Subject: [PATCH 36/50] Update .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 bbd4df7..60f4800 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,5 +7,5 @@ build: - cd sdk - ls -l #- ./run.sh -b - - set - - docker build -t a . + - sed -i .bak 's/sudo docker /docker /g' run.sh + - ./run.sh -b -- GitLab From a5bac4db34d51e1c126d54a000cf537b8a69cffb Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:41:40 +0200 Subject: [PATCH 37/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60f4800..705ff11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,5 +7,5 @@ build: - cd sdk - ls -l #- ./run.sh -b - - sed -i .bak 's/sudo docker /docker /g' run.sh + - sed -i.bak 's/sudo docker /docker /g' run.sh - ./run.sh -b -- GitLab From c0842f01a8b4f61953cdfe06097bbb84c691d5d2 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:44:49 +0200 Subject: [PATCH 38/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 705ff11..c825d55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,4 +8,4 @@ build: - ls -l #- ./run.sh -b - sed -i.bak 's/sudo docker /docker /g' run.sh - - ./run.sh -b + - bash -x ./run.sh -b -- GitLab From 48e3d1cfc38e79c062c5260d32748a223a6970c7 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:50:41 +0200 Subject: [PATCH 39/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c825d55..52d78c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,4 +8,5 @@ build: - ls -l #- ./run.sh -b - sed -i.bak 's/sudo docker /docker /g' run.sh + - sed -i.bak 's/docker run -it /docker run -i /g' run.sh - bash -x ./run.sh -b -- GitLab From 0ab6ee3d2afb7cec8cf929b19999c41c8eaaab54 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:53:39 +0200 Subject: [PATCH 40/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d78c1..dbb5746 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,3 +10,6 @@ build: - sed -i.bak 's/sudo docker /docker /g' run.sh - sed -i.bak 's/docker run -it /docker run -i /g' run.sh - bash -x ./run.sh -b + artifacts: + paths: + - src/miphoto-exec -- GitLab From f33c8570411184f28710a836b89c71e0f3100fcd Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:54:01 +0200 Subject: [PATCH 41/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbb5746..3ebf36e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ build: - sed -i.bak 's/sudo docker /docker /g' run.sh - sed -i.bak 's/docker run -it /docker run -i /g' run.sh - bash -x ./run.sh -b + - ls -l artifacts: paths: - src/miphoto-exec -- GitLab From 84139c709246f8f0cb82d51db675724b483555a0 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:55:04 +0200 Subject: [PATCH 42/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ebf36e..9fa9b26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ build: - ls -l artifacts: paths: - - src/miphoto-exec + - miphoto-exec -- GitLab From 721f4228db90b86ae5161c7a1d3a17c3073cc42a Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 10:55:34 +0200 Subject: [PATCH 43/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fa9b26..a3dc878 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ build: - ls -l artifacts: paths: - - miphoto-exec + - * -- GitLab From e037634beec157772a708272c5758c5ddc71af71 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 11:00:18 +0200 Subject: [PATCH 44/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3dc878..5cd1d86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ build: - ls -l artifacts: paths: - - * + - . -- GitLab From 4d4105156454dcf6931233a1ff2980cd707e98d0 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 11:00:42 +0200 Subject: [PATCH 45/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5cd1d86..1d66bf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ build: - ls -l artifacts: paths: - - . + - src -- GitLab From 275deae0e23d161da3dda746cc6eb230f169e67b Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 11:01:33 +0200 Subject: [PATCH 46/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d66bf0..12a43ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ build: - sed -i.bak 's/docker run -it /docker run -i /g' run.sh - bash -x ./run.sh -b - ls -l + - pwd + - echo "$CI_PROJECT_DIR" artifacts: paths: - src -- GitLab From 8453833e6a1f17929cdcffe7ff73657f2b330724 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 11:02:03 +0200 Subject: [PATCH 47/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12a43ae..702cef7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,4 +15,4 @@ build: - echo "$CI_PROJECT_DIR" artifacts: paths: - - src + - sdk -- GitLab From 990494784ce2550b17361f725629433c8d6d6755 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 11:06:10 +0200 Subject: [PATCH 48/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 702cef7..42fe13d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,14 +5,9 @@ build: script: - . "$HOME"/.bashrc - cd sdk - - ls -l - #- ./run.sh -b - - sed -i.bak 's/sudo docker /docker /g' run.sh - - sed -i.bak 's/docker run -it /docker run -i /g' run.sh + - sed 's/sudo docker /docker /g' run.sh + - sed 's/docker run -it /docker run -i /g' run.sh - bash -x ./run.sh -b - - ls -l - - pwd - - echo "$CI_PROJECT_DIR" artifacts: paths: - - sdk + - sdk/miphoto-exec -- GitLab From bc8849d0d74d7e09aaa5e8ceca5b42af098a5ad0 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 11:07:10 +0200 Subject: [PATCH 49/50] Update .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 42fe13d..60f507a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ build: script: - . "$HOME"/.bashrc - cd sdk - - sed 's/sudo docker /docker /g' run.sh - - sed 's/docker run -it /docker run -i /g' run.sh + - sed -i.bak 's/sudo docker /docker /g' run.sh + - sed -i.bak 's/docker run -it /docker run -i /g' run.sh - bash -x ./run.sh -b artifacts: paths: -- GitLab From 80d36c68dbe1d8baf77c20011fd8d324e5d88be9 Mon Sep 17 00:00:00 2001 From: Martin Mirbauer Date: Tue, 28 Jul 2020 12:22:56 +0200 Subject: [PATCH 50/50] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60f507a..2af62b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ build: tags: - linux script: - - . "$HOME"/.bashrc + - . "$HOME"/.bashrc # HACK, needed when buildign in https://cgg.mff.cuni.cz/gitlab/martinm/docker-in-docker-rootless - cd sdk - sed -i.bak 's/sudo docker /docker /g' run.sh - sed -i.bak 's/docker run -it /docker run -i /g' run.sh -- GitLab