hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-18 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1313 from mathbunnyru/asalikhov/makefile_codestyle

Browse Source 
Simplify Makefile
This commit is contained in:
Erik Sundell
2021-05-21 13:00:42 +02:00
committed by GitHub
parent 2aa1bc9c58 ca2bdfd3f8
commit fd316d5403
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -9,9 +9,9 @@ OWNER?=jupyter
# Need to list the images in build dependency order # Need to list the images in build dependency order
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
ALL_STACKS:=base-notebook ALL_IMAGES:=base-notebook
else else
ALL_STACKS:=base-notebook \ ALL_IMAGES:=base-notebook \
minimal-notebook \ minimal-notebook \
r-notebook \ r-notebook \
scipy-notebook \ scipy-notebook \
@@ -21,13 +21,11 @@ ALL_STACKS:=base-notebook \
all-spark-notebook all-spark-notebook
endif endif
ALL_IMAGES:=$(ALL_STACKS)
# Enable BuildKit for Docker build # Enable BuildKit for Docker build
export DOCKER_BUILDKIT:=1 export DOCKER_BUILDKIT:=1
help:
# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html # http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
help:
@echo "jupyter/docker-stacks" @echo "jupyter/docker-stacks"
@echo "=====================" @echo "====================="
@echo "Replace % with a stack directory name (e.g., make build/minimal-notebook)" @echo "Replace % with a stack directory name (e.g., make build/minimal-notebook)"
@@ -37,10 +35,10 @@ help:
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 \
cp -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.orig;\ cp -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.orig; \
fi;\ fi; \
patch -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.$(ARCH).patch; \ patch -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.$(ARCH).patch; \
fi fi