Commit cb62beb6 authored by Andres Anaya Amariels's avatar Andres Anaya Amariels 🚀
Browse files

docker login in staging branch and delete build/pust to capif-client

parent 8997a324

capif/templates/ci_dev.gitlab-ci.yml

+6 −4
Original line number Diff line number Diff line
@@ -119,11 +119,8 @@ dev_build_and_push: 
  script:

   - export TMP_PWD=$PWD

   - echo "TMP_PWD=$TMP_PWD"

   - echo "### build and push capif-client image###"

   - cd services/capif-client/

   - echo "### docker login###"

   - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY

   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/capif-client:$CI_COMMIT_REF_SLUG .

   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/capif-client:$CI_COMMIT_REF_SLUG

   - echo "----------------------------------------------------"

   - echo "### build and push nginx image###"

   - cd $TMP_PWD/services/nginx/
@@ -190,5 +187,10 @@ dev_build_and_push: 
   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/vault:$CI_COMMIT_REF_SLUG .

   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/vault:$CI_COMMIT_REF_SLUG

   - echo "----------------------------------------------------"

   - echo "### build and push helper image###"

   - cd $TMP_PWD/services/helper/

   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG .

   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG

   - echo "----------------------------------------------------"

   - docker logout $CI_REGISTRY

  <<: *dev_common

capif/templates/ci_staging.gitlab-ci.yml

+7 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ staging_build_and_push: 
  script:

   - export TMP_PWD=$PWD

   - echo "TMP_PWD=$TMP_PWD"

   - echo "### docker login###"

   - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY

   - echo "----------------------------------------------------"

   - echo "### build and push nginx image###"

   - cd $TMP_PWD/services/nginx/
@@ -315,5 +317,10 @@ staging_build_and_push: 
   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/vault:$CI_COMMIT_REF_SLUG .

   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/vault:$CI_COMMIT_REF_SLUG

   - echo "----------------------------------------------------"

   - echo "### build and push helper image###"

   - cd $TMP_PWD/services/helper/

   - docker build -t $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG .

   - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper:$CI_COMMIT_REF_SLUG

   - echo "----------------------------------------------------"

   - docker logout $CI_REGISTRY

  <<: *staging_common