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

Fix arg names for --hist-lines-dir and --manifests-dir

Browse Source
This commit is contained in:
Ayaz Salikhov
2023-11-19 13:34:18 +01:00
parent d8c60bc42c
commit 69e5b1d5c2
6 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
.github/actions/download-manifests/action.yml vendored
View File

@@ -6,10 +6,10 @@ description: Download all manifests and history lines
# https://github.com/actions/download-artifact/issues/6
inputs:
hist-line-dir:
hist-lines-dir:
description: Directory to store history lines
required: true
manifest-dir:
manifests-dir:
description: Directory to store manifest files
required: true
fast-build:
@@ -23,232 +23,232 @@ runs:
uses: actions/download-artifact@v3
with:
name: docker-stacks-foundation-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: docker-stacks-foundation-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: base-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: base-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: minimal-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: minimal-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: scipy-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: scipy-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: r-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: r-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: julia-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: julia-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: tensorflow-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: tensorflow-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: datascience-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: datascience-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: pyspark-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: pyspark-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: all-spark-notebook-aarch64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: all-spark-notebook-x86_64-history_line
path: ${{ inputs.hist-line-dir }}
path: ${{ inputs.hist-lines-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: docker-stacks-foundation-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: docker-stacks-foundation-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: base-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
with:
name: base-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: minimal-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: minimal-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: scipy-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: scipy-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: r-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: r-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: julia-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: julia-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: tensorflow-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: tensorflow-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: datascience-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: datascience-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: pyspark-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: pyspark-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: all-spark-notebook-aarch64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}
- name: Download artifact 📥
uses: actions/download-artifact@v3
if: inputs.fast-build == 'false'
with:
name: all-spark-notebook-x86_64-manifest
path: ${{ inputs.manifest-dir }}
path: ${{ inputs.manifests-dir }}

2
.github/workflows/docker-build-test-upload.yml vendored
View File

@@ -82,7 +82,7 @@ jobs:
retention-days: 3
- name: Write manifest and build history file 🏷
run: python3 -m tagging.write_manifest --short-image-name ${{ inputs.image }} --hist-line-dir /tmp/jupyter/hist_lines/ --manifest-dir /tmp/jupyter/manifests/ --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
run: python3 -m tagging.write_manifest --short-image-name ${{ inputs.image }} --hist-lines-dir /tmp/jupyter/hist_lines/ --manifests-dir /tmp/jupyter/manifests/ --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
shell: bash
- name: Upload manifest file 💾
uses: actions/upload-artifact@v3

6
.github/workflows/docker-wiki-update.yml vendored
View File

@@ -21,8 +21,8 @@ jobs:
- name: Download all manifests and history lines 📥
uses: ./.github/actions/download-manifests
with:
hist-line-dir: /tmp/jupyter/hist_lines/
manifest-dir: /tmp/jupyter/manifests/
hist-lines-dir: /tmp/jupyter/hist_lines/
manifests-dir: /tmp/jupyter/manifests/
fast-build: ${{ contains(github.event.pull_request.title, '[FAST_BUILD]') }}
- name: Display structure of downloaded files 🔍️
run: |
@@ -37,7 +37,7 @@ jobs:
path: wiki/
- name: Update wiki 🏷
run: python3 -m tagging.update_wiki --wiki-dir wiki/ --hist-line-dir /tmp/jupyter/hist_lines/ --manifest-dir /tmp/jupyter/manifests/
run: python3 -m tagging.update_wiki --wiki-dir wiki/ --hist-lines-dir /tmp/jupyter/hist_lines/ --manifests-dir /tmp/jupyter/manifests/
shell: bash
- name: Push Wiki to GitHub 📤

2
Makefile
View File

@@ -70,7 +70,7 @@ linkcheck-docs: ## check broken links
hook/%: ## run post-build hooks for an image
python3 -m tagging.write_tags_file --short-image-name "$(notdir $@)" --tags-dir /tmp/jupyter/tags/ --registry "$(REGISTRY)" --owner "$(OWNER)" && \
python3 -m tagging.write_manifest --short-image-name "$(notdir $@)" --hist-line-dir /tmp/jupyter/hist_lines/ --manifest-dir /tmp/jupyter/manifests/ --registry "$(REGISTRY)" --owner "$(OWNER)" && \
python3 -m tagging.write_manifest --short-image-name "$(notdir $@)" --hist-lines-dir /tmp/jupyter/hist_lines/ --manifests-dir /tmp/jupyter/manifests/ --registry "$(REGISTRY)" --owner "$(OWNER)" && \
python3 -m tagging.apply_tags --short-image-name "$(notdir $@)" --tags-dir /tmp/jupyter/tags/ --platform "$(shell uname -m)" --registry "$(REGISTRY)" --owner "$(OWNER)"
hook-all: $(foreach I, $(ALL_IMAGES), hook/$(I)) ## run post-build hooks for all images

4
tagging/update_wiki.py
View File

@@ -103,13 +103,13 @@ if __name__ == "__main__":
help="Directory of the wiki repo",
)
arg_parser.add_argument(
"--hist-line-dir",
"--hist-lines-dir",
required=True,
type=Path,
help="Directory with history lines",
)
arg_parser.add_argument(
"--manifest-dir",
"--manifests-dir",
required=True,
type=Path,
help="Directory with manifest files",

4
tagging/write_manifest.py
View File

@@ -114,13 +114,13 @@ if __name__ == "__main__":
help="Short image name to create manifests for",
)
arg_parser.add_argument(
"--hist-line-dir",
"--hist-lines-dir",
required=True,
type=Path,
help="Directory to save history line",
)
arg_parser.add_argument(
"--manifest-dir",
"--manifests-dir",
required=True,
type=Path,
help="Directory to save manifest file",