hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-14 21:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy make targets

Browse Source
This commit is contained in:
Peter Parente
2017-11-27 23:14:15 -05:00
parent 033056e6d1
commit 18e0e8cf16
1 changed files with 5 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Makefile
View File

@@ -1,15 +1,13 @@
# Copyright (c) Jupyter Development Team. # Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
.PHONY: help test
.PHONY: build-all help environment-check release-all
# Use bash for inline if-statements in test target # Use bash for inline if-statements in test target
SHELL:=bash SHELL:=bash
OWNER:=jupyter OWNER:=jupyter
# need to list these manually because there's a dependency tree
ARCH:=$(shell uname -m) ARCH:=$(shell uname -m)
# Need to list the images in build dependency order
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
ALL_STACKS:=base-notebook ALL_STACKS:=base-notebook
else else
@@ -25,10 +23,6 @@ endif
ALL_IMAGES:=$(ALL_STACKS) ALL_IMAGES:=$(ALL_STACKS)
GIT_MASTER_HEAD_SHA:=$(shell git rev-parse --short=12 --verify HEAD)
RETRIES:=10
help: help:
# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html # http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
@echo "jupyter/docker-stacks" @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}' @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 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 \ if [ -e ./$(notdir $@)/Dockerfile.orig ]; then \
cp -f ./$(notdir $@)/Dockerfile.orig ./$(notdir $@)/Dockerfile;\ cp -f ./$(notdir $@)/Dockerfile.orig ./$(notdir $@)/Dockerfile;\
else\ else\
@@ -60,40 +54,7 @@ dev/%: PORT?=8888
dev/%: ## run a foreground container for a stack dev/%: ## run a foreground container for a stack
docker run -it --rm -p $(PORT):8888 $(DARGS) $(OWNER)/$(notdir $@) $(ARGS) 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 test/%: ## run a stack container, check for jupyter server liveliness
@-docker rm -f iut @-docker rm -f iut