diff --git a/.travis.yml b/.travis.yml index a32ef87c..b73cd0b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - PROD_IMAGE_NAME=atst-prod - TESTER_IMAGE1_NAME=atst-tester-nocrls - TESTER_IMAGE2_NAME=atst-tester + - GIT_SHA="$(git rev-parse --short HEAD)" cache: directories: - crl @@ -42,8 +43,7 @@ script: before_deploy: - docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile - - git_sha="$(git rev-parse --short HEAD)" - - remote_image_name="${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${git_sha}" + - remote_image_name="${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${GIT_SHA}" - docker tag "${PROD_IMAGE_NAME}" "${remote_image_name}" - docker images - docker push "${remote_image_name}" diff --git a/deploy/kubernetes/atst-update-deploy.sh b/deploy/kubernetes/atst-update-deploy.sh index 96d3314c..51219992 100755 --- a/deploy/kubernetes/atst-update-deploy.sh +++ b/deploy/kubernetes/atst-update-deploy.sh @@ -28,7 +28,7 @@ kubectl config use-context travis kubectl config current-context # Update the ATST deployment -kubectl -n atat set image deployment.apps/atst atst="${remote_image_name}" +kubectl -n atat set image deployment.apps/atst atst="${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${GIT_SHA}" # Remove the K8S CA file when the script exits function cleanup {