Commit 3984cf44 authored by Philippe Pepiot's avatar Philippe Pepiot
Browse files

docker: use docker build --pull

Instead of custom pull-base target
parent f57358da8d10
...@@ -8,7 +8,7 @@ NAMESPACE=intranet ...@@ -8,7 +8,7 @@ NAMESPACE=intranet
all: build all: build
build: build:
docker build -t $(IMAGE) . docker build --pull -t $(IMAGE) .
push: build push: build
docker push $(IMAGE) docker push $(IMAGE)
...@@ -21,10 +21,7 @@ run: build ...@@ -21,10 +21,7 @@ run: build
dev: build dev: build
docker run --rm -it $(DOCKER_ARGS) -v `pwd`:/src $(IMAGE) bash docker run --rm -it $(DOCKER_ARGS) -v `pwd`:/src $(IMAGE) bash
pull-base: deploy: push
grep '^FROM ' Dockerfile | awk '{ print $$2 }' | xargs docker pull
deploy: pull-base push
sed "s@hub.extranet.logilab.fr/logilab/intranet@$(IMAGE)@" deploy/deployment.yaml | kubectl -n $(NAMESPACE) apply -f - sed "s@hub.extranet.logilab.fr/logilab/intranet@$(IMAGE)@" deploy/deployment.yaml | kubectl -n $(NAMESPACE) apply -f -
@echo "wait at max 3 minutes for deployment to be UP" @echo "wait at max 3 minutes for deployment to be UP"
kubectl -n $(NAMESPACE) wait --for=condition=available --timeout=180s deployment/intranet deployment/intranet-scheduler kubectl -n $(NAMESPACE) wait --for=condition=available --timeout=180s deployment/intranet deployment/intranet-scheduler
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment