diff --git a/k8s/20-webapp.yaml b/k8s/20-webapp.yaml index ce679bf..c3a4253 100644 --- a/k8s/20-webapp.yaml +++ b/k8s/20-webapp.yaml @@ -35,7 +35,7 @@ items: spec: containers: - name: 'webapp' - image: 'rtyler/codevalet-webapp:latest' + image: 'codevalet/webapp:latest' imagePullPolicy: Always ports: - containerPort: 9292 diff --git a/webapp/Makefile b/webapp/Makefile index 4718b09..5a3a0f7 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -1,3 +1,4 @@ +IMAGE_NAME=codevalet/webapp all: check container @@ -13,10 +14,13 @@ run: depends monkeys.txt ./scripts/ruby bundle exec puma check-container: container - docker run --rm rtyler/codevalet-webapp:latest bundle exec puma --version + docker run --rm $(IMAGE_NAME):latest bundle exec puma --version container: depends Dockerfile monkeys.txt - docker build -t rtyler/codevalet-webapp . + docker build -t $(IMAGE_NAME) . + +deploy: check-container + docker push $(IMAGE_NAME):latest clean: rm -rf vendor @@ -24,4 +28,4 @@ clean: monkeys.txt: ../monkeys.txt cp ../monkeys.txt . -.PHONY: all depends clean run check container spec check-container +.PHONY: all depends clean run check container spec check-container deploy