Skip to content
Snippets Groups Projects
Commit 8de3bed0 authored by Teddy Kossoko's avatar Teddy Kossoko
Browse files

Merge branch 'develop' into 'master' 

Update .gitlab-ci.yml

See merge request !2
parents fa7a3b42 29bdcde0
No related branches found
No related tags found
2 merge requests!2Update .gitlab-ci.yml,!1Draft: Master
Pipeline #1115 failed with stage
Stage:
    in 10 minutes and 57 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 7 additions and 10 deletions
    .gitlab-ci.yml
    + 7
    − 10
    View file @ 8de3bed0
    ...@@ -4,7 +4,6 @@ image: docker:latest ...@@ -4,7 +4,6 @@ image: docker:latest
    stages: stages:
    - build - build
    - test
    services: services:
    - docker:18.09.7-dind - docker:18.09.7-dind
    ...@@ -15,19 +14,17 @@ variables: ...@@ -15,19 +14,17 @@ variables:
    before_script: before_script:
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY #- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
    - docker login -u eu-west-0@$AK -p 2a66e70323f94d692f02a0e606178fb4c3dae89894092455c792fb48a13dc3d6 registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap
    build-master: build-master:
    stage: build stage: build
    script: script:
    - docker build --pull -t "$CI_REGISTRY_IMAGE" . - ./buildEclipseStack.sh
    - docker push "$CI_REGISTRY_IMAGE" #- docker build --pull -t "$CI_REGISTRY_IMAGE" .
    #- docker push "$CI_REGISTRY_IMAGE"
    only: only:
    - master - master
    build-test:
    stage: test
    script:
    - docker run "$CI_REGISTRY_IMAGE"
    only:
    - master
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment