diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9d782f57f040bcc72833151d572fec83eb05165..114de2ec801805a14f23c0010dfbdf69a2b87732 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,13 +8,6 @@ services: - postgres variables: - DOCKER_DRIVER: overlay2 - CI_APPLICATION_REPOSITORY: ${CI_REGISTRY_IMAGE}/${CI_COMMIT_REF_SLUG} - CI_APPLICATION_TAG: ${CI_COMMIT_SHA} - CI_CONTAINER_NAME: ci_job_build_${CI_JOB_ID} - # Nécessaire pour accéder docker depuis le container du runner - # cf. https://gitlab.com/gitlab-org/gitlab-runner/blob/master/docs/executors/kubernetes.md - DOCKER_HOST: "tcp://localhost:2375" # This folder is cached between builds cache: @@ -25,7 +18,6 @@ cache: stages: - build - tests - - docker ### Jobs ### @@ -46,23 +38,4 @@ tests: script: - echo '{"dn":"dn", "passwd":"passwd"}' >> ldap_credentials.json - npm i - - npm run test - -docker:build: - dependencies: - - build:transpile - stage: docker - image: docker:latest - services: - - docker:dind - script: - - echo $LDAP_CONN_CONFIG > ldap_credentials.json - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - - echo "Building Dockerfile..." - - docker build --pull -t ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} -t ${CI_APPLICATION_REPOSITORY}:latest --build-arg DB_PASSWD=${DB_PASSWD} . - - echo "Pushing to GitLab Container registry $CI_APPLICATION_REPOSITORY with tags '${CI_APPLICATION_TAG}' and 'latest'" - - docker push ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} - - docker push ${CI_APPLICATION_REPOSITORY}:latest - only: - - master - - stable \ No newline at end of file + - npm run test \ No newline at end of file