# HG changeset patch # User Philippe Pepiot <philippe.pepiot@logilab.fr> # Date 1560869429 -7200 # Tue Jun 18 16:50:29 2019 +0200 # Node ID 923b1d1e2d120938fc78c5f1a9c60727b33b846c # Parent 8daefd9acb64502179dc46d2c8cc1b4613994354 [docker] use docker build --pull diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: build build: - docker build -t $(IMAGE) . + docker build --pull -t $(IMAGE) . push: build docker push $(IMAGE) @@ -21,10 +21,7 @@ dev: build docker run --rm -it $(DOCKER_ARGS) -v `pwd`:/src $(IMAGE) bash -pull-base: - grep '^FROM ' Dockerfile | awk '{ print $$2 }' | xargs docker pull - -deploy: pull-base push +deploy: push sed "s@hub.extranet.logilab.fr/logilab/fresh@$(IMAGE)@" deploy/deployment.yaml | kubectl -n $(NAMESPACE) apply -f - @echo "wait at max 3 minutes for deployment to be UP" kubectl -n $(NAMESPACE) wait --for=condition=available --timeout=180s deployment/fresh deployment/fresh-scheduler