pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build remote image name in update-deploy script

Browse Source
This commit is contained in:
Patrick Smith 2018-08-16 14:17:54 -04:00
parent 1acd5fb73a
commit 265b128255
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -10,6 +10,7 @@ env:
- PROD_IMAGE_NAME=atst-prod - PROD_IMAGE_NAME=atst-prod
- TESTER_IMAGE1_NAME=atst-tester-nocrls - TESTER_IMAGE1_NAME=atst-tester-nocrls
- TESTER_IMAGE2_NAME=atst-tester - TESTER_IMAGE2_NAME=atst-tester
- GIT_SHA="$(git rev-parse --short HEAD)"
cache: cache:
directories: directories:
- crl - crl
@ -42,8 +43,7 @@ script:
before_deploy: before_deploy:
- docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile - 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 tag "${PROD_IMAGE_NAME}" "${remote_image_name}"
- docker images - docker images
- docker push "${remote_image_name}" - docker push "${remote_image_name}"

2
deploy/kubernetes/atst-update-deploy.sh
View File

@ -28,7 +28,7 @@ kubectl config use-context travis
kubectl config current-context kubectl config current-context
# Update the ATST deployment # 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 # Remove the K8S CA file when the script exits
function cleanup { function cleanup {