Skip to content

Commit 7663691

Browse files
committed
Merge branch 'main' into asalikhov/ubuntu_jammy
2 parents 51ddfe1 + 180033e commit 7663691

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ ALL_IMAGES:= \
1818
pyspark-notebook \
1919
all-spark-notebook
2020

21+
AARCH64_IMAGES:= \
22+
base-notebook \
23+
minimal-notebook \
24+
r-notebook \
25+
scipy-notebook \
26+
datascience-notebook \
27+
pyspark-notebook \
28+
all-spark-notebook
29+
2130
# Enable BuildKit for Docker build
2231
export DOCKER_BUILDKIT:=1
2332

@@ -35,12 +44,11 @@ help:
3544

3645
build/%: DOCKER_BUILD_ARGS?=
3746
build/%: ## build the latest image for a stack using the system's architecture
38-
@echo "::group::Build $(OWNER)/$(notdir $@) (system's architecture)"
3947
docker build $(DOCKER_BUILD_ARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER)
4048
@echo -n "Built image size: "
4149
@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
42-
@echo "::endgroup::"
4350
build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
51+
build-aarch64: $(foreach I, $(AARCH64_IMAGES), build/$(I)) ## build aarch64 stacks
4452

4553

4654
check-outdated/%: ## check the outdated mamba/conda packages in a stack and produce a report (experimental)
@@ -101,9 +109,7 @@ pull-all: $(foreach I, $(ALL_IMAGES), pull/$(I)) ## pull all images
101109

102110

103111
push/%: ## push all tags for a jupyter image
104-
@echo "::group::Push $(OWNER)/$(notdir $@) (system's architecture)"
105112
docker push --all-tags $(OWNER)/$(notdir $@)
106-
@echo "::endgroup::"
107113
push-all: $(foreach I, $(ALL_IMAGES), push/$(I)) ## push all tagged images
108114

109115

@@ -117,7 +123,5 @@ run-sudo-shell/%: ## run a bash in interactive mode as root in a stack
117123

118124

119125
test/%: ## run tests against a stack
120-
@echo "::group::test/$(OWNER)/$(notdir $@)"
121126
python3 -m tests.run_tests --short-image-name "$(notdir $@)" --owner "$(OWNER)"
122-
@echo "::endgroup::"
123127
test-all: $(foreach I, $(ALL_IMAGES), test/$(I)) ## test all stacks

0 commit comments

Comments
 (0)