- ensure base images are build first
This commit is contained in:
@@ -20,16 +20,27 @@ DIRS := $(shell find $(IMAGES_PATH) -mindepth 3 -maxdepth 3 -type d | sed 's|$(I
|
||||
default: clean
|
||||
./ci/build.sh
|
||||
|
||||
# Make all images
|
||||
# Separate base images from others
|
||||
BASE_IMAGES = $(filter %/base,$(DIRS))
|
||||
OTHER_IMAGES = $(filter-out %/base,$(DIRS))
|
||||
|
||||
# Make all images, ensuring base images build first
|
||||
all:
|
||||
@for dir in $(DIRS); do \
|
||||
@for dir in $(BASE_IMAGES); do \
|
||||
$(MAKE) $$dir; \
|
||||
done
|
||||
@for dir in $(OTHER_IMAGES); do \
|
||||
$(MAKE) $$dir; \
|
||||
done
|
||||
|
||||
|
||||
# List all directories
|
||||
list:
|
||||
@echo "Images:"
|
||||
@for dir in $(DIRS); do \
|
||||
@for dir in $(BASE_IMAGES); do \
|
||||
echo " '$$dir'"; \
|
||||
done
|
||||
@for dir in $(OTHER_IMAGES); do \
|
||||
echo " '$$dir'"; \
|
||||
done
|
||||
|
||||
|
||||
Reference in New Issue
Block a user