diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml index 40efdf1161075476f08e3a18e4d86194d0ce0dd7..587b06d990eaace612a75be1d6e23a782ea9b8aa 100644 --- a/ci-templates/industrial-ci-templates.yml +++ b/ci-templates/industrial-ci-templates.yml @@ -29,6 +29,8 @@ variables: DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL} DOCKER_PUSH_NAME: ${CI_PROJECT_PATH} DOCKER_PUSH_TAG: ${CI_COMMIT_REF_NAME} + DOCKER_PUSH_USER: ${ARTIFACT_CI_USER} + DOCKER_PUSH_TOKEN: ${ARTIFACT_CI_TOKEN} DDEPLOY_YAML: ddeploy.yaml before_script: - apk add --update python3 git py3-pip git-lfs bash curl jq @@ -45,8 +47,10 @@ variables: - echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.com > ~/.git-credentials # install ddeploy - pip install --break-system-packages git+ssh://git@git.code.tecnalia.com/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy.git@v0.2.0 - - echo "Logging into docker registry ${DOCKER_PUSH_REGISTRY} for user ${ARTIFACT_CI_USER}" - - docker login ${DOCKER_PUSH_REGISTRY} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} + - echo "Logging into docker registry ${ARTIFACT_DOCKER_URL} for user ${ARTIFACT_CI_USER}" + - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} + - echo "Logging into docker registry ${DOCKER_PUSH_REGISTRY} for user ${DOCKER_PUSH_USER}" + - docker login ${DOCKER_PUSH_REGISTRY} -u ${DOCKER_PUSH_USER} -p ${DOCKER_PUSH_TOKEN} script: # Run ddeploy - ddeploy --yaml ${DDEPLOY_YAML}