Move all images to images dir (#1972)

.github/workflows/docker-build-test-upload.yml

@@ -60,7 +60,7 @@ jobs:
         shell: bash
 
       - name: Build image 🛠
-        run: docker build --rm --force-rm --tag ${{ env.OWNER }}/${{ inputs.image }} ${{ inputs.image }}/
+        run: docker build --rm --force-rm --tag ${{ env.OWNER }}/${{ inputs.image }} images/${{ inputs.image }}/
         env:
           DOCKER_BUILDKIT: 1
           # Full logs for CI build

.github/workflows/docker.yml

@@ -20,17 +20,7 @@ on:
       - ".github/actions/download-manifests/action.yml"
       - ".github/actions/load-image/action.yml"
 
-      - "all-spark-notebook/**"
+      - "images/**"
-      - "base-notebook/**"
-      - "datascience-notebook/**"
-      - "docker-stacks-foundation/**"
-      - "julia-notebook/**"
-      - "minimal-notebook/**"
-      - "pyspark-notebook/**"
-      - "r-notebook/**"
-      - "scipy-notebook/**"
-      - "tensorflow-notebook/**"
-
       - "tagging/**"
       - "tests/**"
       - "requirements-dev.txt"
@@ -48,17 +38,7 @@ on:
       - ".github/actions/download-manifests/action.yml"
       - ".github/actions/load-image/action.yml"
 
-      - "all-spark-notebook/**"
+      - "images/**"
-      - "base-notebook/**"
-      - "datascience-notebook/**"
-      - "docker-stacks-foundation/**"
-      - "julia-notebook/**"
-      - "minimal-notebook/**"
-      - "pyspark-notebook/**"
-      - "r-notebook/**"
-      - "scipy-notebook/**"
-      - "tensorflow-notebook/**"
-
       - "tagging/**"
       - "tests/**"
       - "requirements-dev.txt"

.github/workflows/hub-overview.yml

@@ -10,16 +10,7 @@ on:
     paths:
       - ".github/workflows/hub-overview.yml"
 
-      - "all-spark-notebook/README.md"
+      - "images/*/README.md"
-      - "base-notebook/README.md"
-      - "datascience-notebook/README.md"
-      - "docker-stacks-foundation/README.md"
-      - "julia-notebook/README.md"
-      - "minimal-notebook/README.md"
-      - "pyspark-notebook/README.md"
-      - "r-notebook/README.md"
-      - "scipy-notebook/README.md"
-      - "tensorflow-notebook/README.md"
 
 jobs:
   update-dockerhub-overview:
@@ -40,7 +31,7 @@ jobs:
           destination_container_repo: ${{ env.OWNER }}/${{ matrix.image }}
           provider: dockerhub
           short_description: ${{ matrix.description }}
-          readme_file: ${{ matrix.image }}/README.md
+          readme_file: images/${{ matrix.image }}/README.md
 
     strategy:
       matrix:

Makefile

@@ -37,7 +37,7 @@ help:
 
 build/%: DOCKER_BUILD_ARGS?=
 build/%: ## build the latest image for a stack using the system's architecture
-	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm --tag "$(OWNER)/$(notdir $@):latest" "./$(notdir $@)" --build-arg OWNER="$(OWNER)"
+	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm --tag "$(OWNER)/$(notdir $@):latest" "./images/$(notdir $@)" --build-arg OWNER="$(OWNER)"
 	@echo -n "Built image size: "
 	@docker images "$(OWNER)/$(notdir $@):latest" --format "{{.Size}}"
 build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks

tagging/write_manifest.py

@@ -38,7 +38,7 @@ def write_build_history_line(
     links_column = MARKDOWN_LINE_BREAK.join(
         [
             f"[Git diff](https://github.com/jupyter/docker-stacks/commit/{commit_hash})",
-            f"[Dockerfile](https://github.com/jupyter/docker-stacks/blob/{commit_hash}/{short_image_name}/Dockerfile)",
+            f"[Dockerfile](https://github.com/jupyter/docker-stacks/blob/{commit_hash}/images/{short_image_name}/Dockerfile)",
             f"[Build manifest](./{filename})",
         ]
     )