This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 6e27a0a02f98e726da1794f4b3b4a7c34044949a Author: Benjamin <poussin@codelutin.com> Date: Tue May 12 00:48:12 2020 +0200 essai de correction de la position du repertoire /migrate --- .gitlab-ci.yml | 21 ++++++++++++++------- docker/Dockerfile | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bb8891..c5bd842 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,14 +2,17 @@ stages: - build - deploy +default: + before_script: + - export IMAGE_NAME=$CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG/master/latest} + dockerise: image: registry.nuiton.org/codelutin/dockerfiles:docker stage: build script: - - IMAGE_NAME=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -f docker/Dockerfile . - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + - docker build -t $IMAGE_NAME -f docker/Dockerfile . + - docker push $IMAGE_NAME - docker logout $CI_REGISTRY tags: - docker @@ -19,7 +22,11 @@ deploy: when: manual stage: deploy script: - - cat docker/docker-compose.yml | envsubst > docker-compose.yml - - chmod +x docker-compose.yml - - zip docker-compose.zip docker-compose.yml - - curl -v -F "name=$CI_PROJECT_NAME" -F "flavour=$CI_COMMIT_REF_SLUG" -F "target=infrasaas" -F "info=$CI_COMMIT_MESSAGE" -F "composeFile=docker-compose.yml" -F "zip=@docker-compose.zip" "https://swarm-deployer.cloud.codelutin.com/api/v1/projects?swarm-deployer-to..." + - export ZIP_NAME=$CI_PROJECT_NAME-${CI_COMMIT_REF_SLUG/master/latest}.zip + - export STACK_FILE=_stack.yml + - cd docker + - cat docker-compose.yml | envsubst > $STACK_FILE + - FILES="$STACK_FILE" + - for f in script config secret; do if [ -d $f ]; then FILES="$FILES $f"; fi; done + - zip -r $ZIP_NAME $FILES + - curl -F "name=$CI_PROJECT_NAME" -F "flavour=$CI_COMMIT_REF_SLUG" -F "target=infracl" -F "info=${CI_COMMIT_REF_SLUG/master/latest}(${CI_COMMIT_SHORT_SHA}) - $CI_COMMIT_MESSAGE" -F "composeFile=$STACK_FILE" -F "zip=@$ZIP_NAME" "https://swarm-deployer.cloud.codelutin.com/api/v1/projects?swarm-deployer-to..." diff --git a/docker/Dockerfile b/docker/Dockerfile index d101a0d..2e64040 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,7 @@ COPY . . RUN GOPROXY=https://proxy.golang.org CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags="-s -w" -o /bow/bow cmd/bow/main.go FROM gcr.io/distroless/static:nonroot +WORKDIR / COPY --from=gobuilder /bow/bow / COPY --from=gobuilder /build/migrate /migrate COPY --from=vuebuilder /build/web/dist /web -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.