Skip to content
Snippets Groups Projects
Commit 0dfabce2 authored by Andres Anaya Amariels's avatar Andres Anaya Amariels :rocket:
Browse files

refactor: comment out unused CI variables and update docker login command for security

parent 329a570e
No related branches found
No related tags found
No related merge requests found
...@@ -30,13 +30,13 @@ stages: ...@@ -30,13 +30,13 @@ stages:
variables: variables:
GITLAB_API: "https://labs.etsi.org/api/v4" GITLAB_API: "https://labs.etsi.org/api/v4"
CI_JOB_TOKEN: $CI_JOB_TOKEN # CI_JOB_TOKEN: $CI_JOB_TOKEN
CI_DEBUG_TRACE: "true" CI_DEBUG_TRACE: "true"
PROJECT_ID: "294" PROJECT_ID: "294"
SAST_EXCLUDED_ANALYZERS: "nodejs-scan" SAST_EXCLUDED_ANALYZERS: "nodejs-scan"
CI_REGISTRY_USER: $CI_REGISTRY_USER # CI_REGISTRY_USER: $CI_REGISTRY_USER
CI_REGISTRY: $CI_REGISTRY # CI_REGISTRY: $CI_REGISTRY
CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY # CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
.main_common: &main_common .main_common: &main_common
...@@ -230,7 +230,7 @@ main_build_and_push: ...@@ -230,7 +230,7 @@ main_build_and_push:
- export TMP_PWD=$PWD - export TMP_PWD=$PWD
- echo "TMP_PWD=$TMP_PWD" - echo "TMP_PWD=$TMP_PWD"
- echo "### docker login###" - echo "### docker login###"
- docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
- echo "----------------------------------------------------" - echo "----------------------------------------------------"
- echo "### build and push nginx image###" - echo "### build and push nginx image###"
- cd $TMP_PWD/services/nginx/ - cd $TMP_PWD/services/nginx/
......
...@@ -11,13 +11,13 @@ variables: ...@@ -11,13 +11,13 @@ variables:
DOMAIN_STAGING: ocf.validation DOMAIN_STAGING: ocf.validation
DOMAIN_DEV: ocf.develop DOMAIN_DEV: ocf.develop
DOMAIN_PROD: prod.int DOMAIN_PROD: prod.int
CI_JOB_TOKEN: $CI_JOB_TOKEN # CI_JOB_TOKEN: $CI_JOB_TOKEN
IMAGE_TAG_DEV: $CI_COMMIT_REF_SLUG IMAGE_TAG_DEV: $CI_COMMIT_REF_SLUG
IMAGE_TAG_STAGING: $CI_COMMIT_REF_SLUG IMAGE_TAG_STAGING: $CI_COMMIT_REF_SLUG
VAULT_HOSTNAME: $VAULT_HOSTNAME VAULT_HOSTNAME: $VAULT_HOSTNAME
VAULT_PORT: $VAULT_PORT VAULT_PORT: $VAULT_PORT
VAULT_ACCESS_TOKEN: $VAULT_ACCESS_TOKEN VAULT_ACCESS_TOKEN: $VAULT_ACCESS_TOKEN
CI_REGISTRY: $CI_REGISTRY # CI_REGISTRY: $CI_REGISTRY
.staging_common: &staging_common .staging_common: &staging_common
only: only:
......
...@@ -128,7 +128,6 @@ dev_build_and_push: ...@@ -128,7 +128,6 @@ dev_build_and_push:
- export TMP_PWD=$PWD - export TMP_PWD=$PWD
- echo "TMP_PWD=$TMP_PWD" - echo "TMP_PWD=$TMP_PWD"
- echo "### docker login###" - echo "### docker login###"
# - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY
- echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
- echo "----------------------------------------------------" - echo "----------------------------------------------------"
- echo "### build and push nginx image###" - echo "### build and push nginx image###"
......
...@@ -10,11 +10,11 @@ stages: ...@@ -10,11 +10,11 @@ stages:
- staging_build_and_push_mr - staging_build_and_push_mr
variables: variables:
CI_JOB_TOKEN: $CI_JOB_TOKEN # CI_JOB_TOKEN: $CI_JOB_TOKEN
CI_DEBUG_TRACE: "false" CI_DEBUG_TRACE: "false"
CI_REGISTRY_USER: $CI_REGISTRY_USER # CI_REGISTRY_USER: $CI_REGISTRY_USER
CI_REGISTRY: $CI_REGISTRY # CI_REGISTRY: $CI_REGISTRY
CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY # CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
.staging_common: &staging_common .staging_common: &staging_common
only: only:
......
...@@ -2,11 +2,11 @@ stages: ...@@ -2,11 +2,11 @@ stages:
- staging_unit_tests - staging_unit_tests
variables: variables:
CI_JOB_TOKEN: $CI_JOB_TOKEN # CI_JOB_TOKEN: $CI_JOB_TOKEN
CI_DEBUG_TRACE: "false" CI_DEBUG_TRACE: "false"
CI_REGISTRY_USER: $CI_REGISTRY_USER # CI_REGISTRY_USER: $CI_REGISTRY_USER
CI_REGISTRY: $CI_REGISTRY # CI_REGISTRY: $CI_REGISTRY
CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY # CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
.staging_common: &staging_common .staging_common: &staging_common
only: only:
......
...@@ -3,10 +3,10 @@ stages: ...@@ -3,10 +3,10 @@ stages:
- deploy_ocf_prod - deploy_ocf_prod
variables: variables:
CI_JOB_TOKEN: $CI_JOB_TOKEN # CI_JOB_TOKEN: $CI_JOB_TOKEN
CI_DEBUG_TRACE: "false" CI_DEBUG_TRACE: "false"
CI_REGISTRY_USER: $CI_REGISTRY_USER # CI_REGISTRY_USER: $CI_REGISTRY_USER
CI_REGISTRY: $CI_REGISTRY # CI_REGISTRY: $CI_REGISTRY
CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
NAMESPACE_PROD: "ocf-prod" NAMESPACE_PROD: "ocf-prod"
DOMAIN_PROD: prod.int DOMAIN_PROD: prod.int
...@@ -33,7 +33,7 @@ prod_build_and_push: ...@@ -33,7 +33,7 @@ prod_build_and_push:
- export TMP_PWD=$PWD - export TMP_PWD=$PWD
- echo "TMP_PWD=$TMP_PWD" - echo "TMP_PWD=$TMP_PWD"
- echo "### docker login###" - echo "### docker login###"
- docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
- echo "----------------------------------------------------" - echo "----------------------------------------------------"
- echo "### build and push nginx image###" - echo "### build and push nginx image###"
- cd $TMP_PWD/services/nginx/ - cd $TMP_PWD/services/nginx/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment