Some fixes

Author: Ayaz Salikhov

.github/workflows/docker.yml

@@ -66,10 +66,12 @@ jobs:
           python -m pip install --upgrade pip
           make -C main dev-env
       - name: Build Docker Images
-        run: make -C main build-test-all
+        run: make -C main build-all
         env:
           # Full logs for CI build
           BUILDKIT_PROGRESS: plain
+      - name: Test Docker Images
+        run: make -C main test-all
       - name: Clone Wiki
         uses: actions/checkout@v2
         with:

Makefile

@@ -35,29 +35,23 @@ export DOCKER_BUILDKIT:=1
 help:
 	@echo "jupyter/docker-stacks"
 	@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-cross/minimal-notebook)"
 	@echo
 	@grep -E '^[a-zA-Z0-9_%/-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 build-x86/%: DARGS?=
-build-x86/%: ## build the latest image for a stack
+build-x86/%: ## build the latest image for a stack on x86 only
 	docker buildx build $(DARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --platform "linux/amd64" --push
 	@echo -n "Built image size: "
 	@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
-build-test-x86-all: $(foreach I,$(X86_IMAGES), build-x86/$(I) test/$(I) ) ## build and test all stacks
 
 build-cross/%: DARGS?=
 build-cross/%: ## build the latest image for a stack on x86 and ARM
 	docker buildx build $(DARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER) --platform "linux/amd64,linux/arm64" --push
 	@echo -n "Built image size: "
 	@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
-build-test-cross-all: $(foreach I,$(X86_IMAGES), build-x86/$(I) test/$(I) ) ## build and test all stacks
 
-build-all: $(foreach I,$(CROSS_IMAGES), build-cross/$(I) ) $(foreach I,$(X86_IMAGES), build/$(I) ) ## build all stacks
-build-test-all: build-all $(foreach I,$(ALL_IMAGES), test/$(I) ) ## build and test all stacks
-
-build-all: $(foreach I,$(ALL_IMAGES), build/$(I) ) ## build all stacks
-build-test-all: $(foreach I,$(ALL_IMAGES), build/$(I) test/$(I) ) ## build and test all stacks
+build-all: $(foreach I,$(CROSS_IMAGES), build-cross/$(I) ) $(foreach I,$(X86_IMAGES), build-x86/$(I) ) ## build all stacks
 
 check-outdated/%: ## check the outdated conda packages in a stack and produce a report (experimental)
 	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test/test_outdated.py