Skip to content

Commit

Permalink
Des 1950 update deployment (#57)
Browse files Browse the repository at this point in the history
* Remove deploying of image to Dockerhub from CI

* Fix kubectl apply command to use correct context

* Stop building docker container using latest as cache
  • Loading branch information
nathanfranklin authored May 4, 2021
1 parent 1d23958 commit 86761f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
22 changes: 2 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ jobs:
include:
- name: "geoapi: unit tests / container"
before_script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker pull taccaci/geoapi:latest
- docker build --cache-from taccaci/geoapi:latest -t taccaci/geoapi:latest .
- docker build -t taccaci/geoapi:latest .
- sudo mkdir /assets
- sudo service mysql stop
- sudo service postgresql stop
Expand All @@ -21,18 +19,9 @@ jobs:
- sleep 5
script:
- docker run --net=test -e APP_ENV=testing taccaci/geoapi:latest pytest --cov=geoapi -m "not worker"
before_deploy:
- docker tag taccaci/geoapi:latest taccaci/geoapi:${GIT_HASH}
deploy:
provider: script
script: docker push taccaci/geoapi:latest && docker push taccaci/geoapi:${GIT_HASH}
on:
branch: master
- name: "geoapi-workers: unit tests / container"
before_script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker pull taccaci/geoapi-workers:latest
- docker build --cache-from taccaci/geoapi-workers:latest -t taccaci/geoapi-workers:latest -f Dockerfile.potree .
- docker build -t taccaci/geoapi-workers:latest -f Dockerfile.potree .
- sudo mkdir /assets
- sudo service mysql stop
- sudo service postgresql stop
Expand All @@ -41,10 +30,3 @@ jobs:
- sleep 5
script:
- docker run --net=test -e APP_ENV=testing taccaci/geoapi-workers:latest pytest --cov=geoapi -m "worker"
before_deploy:
- docker tag taccaci/geoapi-workers:latest taccaci/geoapi-workers:${GIT_HASH}
deploy:
provider: script
script: docker push taccaci/geoapi-workers:latest && docker push taccaci/geoapi-workers:${GIT_HASH}
on:
branch: master
2 changes: 1 addition & 1 deletion kube/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ checkfortag:
.PHONY: create
create: checkforcontext checkfortag
@echo "Creating geoapi deployment/services/migration-job in '$(KUBE_CONTEXT)' context"
source ${ENV_FILE} && cat geoapi.yaml | envsubst '$${GEOAPI_TAG} $${NODEPORT} $${NSFSHARE_CLUSTER_IP}' | kubectl apply -f -
source ${ENV_FILE} && cat geoapi.yaml | envsubst '$${GEOAPI_TAG} $${NODEPORT} $${NSFSHARE_CLUSTER_IP}' | kubectl apply --context $(KUBE_CONTEXT) -f -

.PHONY: delete
delete: checkforcontext
Expand Down

0 comments on commit 86761f2

Please sign in to comment.