branch bow-v2-go updated (f7ed8b0 -> 2452309)
This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from f7ed8b0 Update postgres new 2452309 Factoriser .gitab-ci.yml The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2452309007d40569324dc41f0c54b6313fdd9512 Author: Andrés Maldonado <maldonado@codelutin.com> Date: Thu Dec 9 11:55:21 2021 +0100 Factoriser .gitab-ci.yml Summary of changes: .gitlab-ci.yml | 54 ++++++++++++++++------------------------------- docker/docker-compose.yml | 2 +- 2 files changed, 19 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 2452309007d40569324dc41f0c54b6313fdd9512 Author: Andrés Maldonado <maldonado@codelutin.com> Date: Thu Dec 9 11:55:21 2021 +0100 Factoriser .gitab-ci.yml --- .gitlab-ci.yml | 54 ++++++++++++++++------------------------------- docker/docker-compose.yml | 2 +- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a23ab..5207bdd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,42 +4,24 @@ stages: default: before_script: - - export IMAGE_NAME=$CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG/master/latest} + - mkdir -p docker/configs + - cat readability-js/*.js > docker/configs/readability.js -generate-readability: - image: registry.nuiton.org/codelutin/dockerfiles:docker - stage: build - script: - - mkdir -p docker/script - - cat readability-js/*.js > docker/script/readability.js - artifacts: - paths: - - docker/script/readability.js +variables: + TARGET: saas + DEPLOY_DIR: docker + DOCKERFILE: docker/Dockerfile -dockerise: - image: registry.nuiton.org/codelutin/dockerfiles:docker - stage: build - script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker build -t $IMAGE_NAME -f docker/Dockerfile . - - docker push $IMAGE_NAME - - docker logout $CI_REGISTRY - tags: - - docker +# Lancer la CI seulement sur la branche par défaut (master), les tags et les merge requests. +workflow: + rules: + - if: $CI_MERGE_REQUEST_IID + - if: $CI_COMMIT_TAG + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + +include: + - project: 'codelutin/ci' + file: + - '/swarm/swarm-deployer.yml' + - '/swarm/build.yml' -deploy: - image: registry.nuiton.org/codelutin/swarm-deployer - when: manual - stage: deploy - script: - - 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=saas" -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..." - environment: - name: ${CI_BUILD_REF_NAME} - url: https://bookmarks.cl diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 246f4ae..895d1df 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,7 +18,7 @@ volumes: configs: readability_script_js: - file: script/readability.js + file: configs/readability.js services: bow: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm