From 51a0f8a5c4ee4e3c73f98f802515e9916dff6d01 Mon Sep 17 00:00:00 2001 From: Julien Grenier Date: Wed, 28 Nov 2018 09:30:08 +0000 Subject: [PATCH 1/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 485b8d5..bdeff21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,4 @@ build: - stage: build image: docker:latest services: - docker:dind -- GitLab From 1fa4a26327b93e29715ec617260b236f05b6585e Mon Sep 17 00:00:00 2001 From: Julien Grenier Date: Wed, 28 Nov 2018 09:30:54 +0000 Subject: [PATCH 2/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdeff21..485b8d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ build: + stage: build image: docker:latest services: - docker:dind -- GitLab From 07580212cc68068be50e130ea17fd0176959da94 Mon Sep 17 00:00:00 2001 From: Julien Grenier Date: Wed, 28 Nov 2018 09:31:27 +0000 Subject: [PATCH 3/5] 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 485b8d5..4ebc5b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,5 @@ build: - docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$ANTORA_VERSION" - docker push "$CI_REGISTRY_IMAGE:$ANTORA_VERSION" - docker push "$CI_REGISTRY_IMAGE:latest" - only: - - master@antora/docker-antora +# only: +# - master@antora/docker-antora -- GitLab From 4cd9d254fe98570a3d231bcbaacd67bd7c12723a Mon Sep 17 00:00:00 2001 From: Julien Grenier Date: Wed, 28 Nov 2018 09:32:50 +0000 Subject: [PATCH 4/5] fix the find install.js not found on nodegit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e7407f..c85c09f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apk --no-cache add --virtual .build-deps g++ libressl-dev make python curl-d && mv $(yarn cache dir)/npm-nodegit-[0-9]* /tmp/ \ && rm -rf $(yarn cache dir)/* \ && find /tmp/npm-nodegit-* -regex '.*/\(include\|src\|vendor\)$' -maxdepth 1 -exec rm -rf {} \; \ - && find /tmp/npm-nodegit-*/lifecycleScripts/*install.js -exec sed -i '1s/^/return;\n/' {} \; \ + && find /tmp/npm-nodegit-*/node_modules/nodegit/lifecycleScripts/*install.js -exec sed -i '1s/^/return;\n/' {} \; \ && mv /tmp/npm-nodegit-* $(yarn cache dir)/ \ && find $(yarn global dir)/node_modules/nodegit -regex '.*/\(include\|src\|vendor\)$' -maxdepth 1 -exec rm -rf {} \; \ && rm -rf $(yarn global dir)/node_modules/nodegit/build/Release/.deps -- GitLab From c30ad36531e6e4d8f533b98db2a2ca6d33a37ab8 Mon Sep 17 00:00:00 2001 From: Julien Grenier Date: Wed, 28 Nov 2018 09:41:51 +0000 Subject: [PATCH 5/5] 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 4ebc5b7..485b8d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,5 @@ build: - docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$ANTORA_VERSION" - docker push "$CI_REGISTRY_IMAGE:$ANTORA_VERSION" - docker push "$CI_REGISTRY_IMAGE:latest" -# only: -# - master@antora/docker-antora + only: + - master@antora/docker-antora -- GitLab