diff --git a/Makefile b/Makefile index d209f792..677dcb9b 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,15 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. - -.PHONY: build-all help environment-check release-all +.PHONY: help test # Use bash for inline if-statements in test target SHELL:=bash - OWNER:=jupyter -# need to list these manually because there's a dependency tree ARCH:=$(shell uname -m) +# Need to list the images in build dependency order ifeq ($(ARCH),ppc64le) -ALL_STACKS:=base-notebook +ALL_STACKS:=base-notebook else ALL_STACKS:=base-notebook \ minimal-notebook \ @@ -25,10 +23,6 @@ endif ALL_IMAGES:=$(ALL_STACKS) -GIT_MASTER_HEAD_SHA:=$(shell git rev-parse --short=12 --verify HEAD) - -RETRIES:=10 - help: # http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html @echo "jupyter/docker-stacks" @@ -38,7 +32,7 @@ help: @grep -E '^[a-zA-Z0-9_%/-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' arch_patch/%: ## apply hardware architecture specific patches to the Dockerfile - if [ -e ./$(notdir $@)/Dockerfile.$(ARCH).patch ]; then \ + @if [ -e ./$(notdir $@)/Dockerfile.$(ARCH).patch ]; then \ if [ -e ./$(notdir $@)/Dockerfile.orig ]; then \ cp -f ./$(notdir $@)/Dockerfile.orig ./$(notdir $@)/Dockerfile;\ else\ @@ -60,40 +54,7 @@ dev/%: PORT?=8888 dev/%: ## run a foreground container for a stack docker run -it --rm -p $(PORT):8888 $(DARGS) $(OWNER)/$(notdir $@) $(ARGS) -environment-check: - test -e ~/.docker-stacks-builder -push/%: ## push the latest and HEAD git SHA tags for a stack to Docker Hub - docker push $(OWNER)/$(notdir $@):latest - docker push $(OWNER)/$(notdir $@):$(GIT_MASTER_HEAD_SHA) - -push-all: $(ALL_IMAGES:%=push/%) ## push all stacks - -refresh/%: ## pull the latest image from Docker Hub for a stack -# skip if error: a stack might not be on dockerhub yet - -docker pull $(OWNER)/$(notdir $@):latest - -refresh-all: $(ALL_IMAGES:%=refresh/%) ## refresh all stacks - -release-all: environment-check \ - refresh-all \ - build-test-all \ - tag-all \ - push-all -release-all: ## build, test, tag, and push all stacks - -retry/%: - @for i in $$(seq 1 $(RETRIES)); do \ - make $(notdir $@) ; \ - if [[ $$? == 0 ]]; then exit 0; fi; \ - echo "Sleeping for $$((i * 60))s before retry" ; \ - sleep $$((i * 60)) ; \ - done ; exit 1 - -tag/%: ##tag the latest stack image with the HEAD git SHA - docker tag -f $(OWNER)/$(notdir $@):latest $(OWNER)/$(notdir $@):$(GIT_MASTER_HEAD_SHA) - -tag-all: $(ALL_IMAGES:%=tag/%) ## tag all stacks test/%: ## run a stack container, check for jupyter server liveliness @-docker rm -f iut @@ -104,4 +65,4 @@ test/%: ## run a stack container, check for jupyter server liveliness if [[ $$? == 0 ]]; then exit 0; fi; \ done ; exit 1 -test-all: $(ALL_IMAGES:%=test/%) ## test all stacks +test-all: $(ALL_IMAGES:%=test/%) ## test all stacks \ No newline at end of file