Skip to content

Commit

Permalink
Require image path in workflows and add code notebook
Browse files Browse the repository at this point in the history
  • Loading branch information
@tmetzl
tmetzl committed Apr 19, 2024
1 parent 2ec13bd commit 540b864
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 21 deletions.
75 changes: 56 additions & 19 deletions .github/workflows/build_and_push_all_images.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ jobs:
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build }}
image_name: minimal-notebook
registry: ${{ inputs.registry }}
base_image_name: jupyter/minimal-notebook
base_image_tag: notebook-6.5.4
image_path: images/minimal-notebook
image_name: minimal-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit
Expand All @@ -61,11 +62,12 @@ jobs:
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.minimal_notebook.outputs.did_build_image == 'true' }}
image_name: desktop-notebook
image_tag: ${{ inputs.tag }}
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/minimal-notebook
base_image_tag: ${{ inputs.tag }}
image_path: images/desktop-notebook
image_name: desktop-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

Expand All @@ -74,11 +76,12 @@ jobs:
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.desktop_notebook.outputs.did_build_image == 'true' }}
image_name: dbmain-notebook
image_tag: ${{ inputs.tag }}
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/desktop-notebook
base_image_tag: ${{ inputs.tag }}
base_image_tag: ${{ inputs.tag }}
image_path: images/dbmain-notebook
image_name: dbmain-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

Expand All @@ -88,10 +91,10 @@ jobs:
with:
force_build: ${{ inputs.force_build || needs.dbmain_notebook.outputs.did_build_image == 'true' }}
registry: ${{ inputs.registry }}
image_name: dbmain-notebook
image_tag: ${{ inputs.tag }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/dbmain-notebook
base_image_tag: ${{ inputs.tag }}
image_name: dbmain-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
e2xgrader_installation_source: ${{ inputs.e2xgrader_installation_source }}
e2xgrader_version: ${{ inputs.e2xgrader_version }}
Expand All @@ -103,11 +106,12 @@ jobs:
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.minimal_notebook.outputs.did_build_image == 'true' }}
image_name: datascience-notebook
image_tag: ${{ inputs.tag }}
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/minimal-notebook
base_image_tag: ${{ inputs.tag }}
image_path: images/datascience-notebook
image_name: datascience-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

Expand All @@ -132,11 +136,12 @@ jobs:
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.datascience_notebook.outputs.did_build_image == 'true' }}
image_name: sql-notebook
image_tag: ${{ inputs.tag }}
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/datascience-notebook
base_image_tag: ${{ inputs.tag }}
base_image_tag: ${{ inputs.tag }}
image_path: images/sql-notebook
image_name: sql-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

Expand All @@ -156,16 +161,47 @@ jobs:
e2xgrader_branch: ${{ inputs.e2xgrader_branch }}
secrets: inherit

ml_notebook:
code_datascience_notebook:
needs: [datascience_notebook]
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.datascience_notebook.outputs.did_build_image == 'true' }}
image_name: ml-notebook
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/datascience-notebook
base_image_tag: ${{ inputs.tag }}
image_path: images/code-notebook
image_name: datascience-notebook-code
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

e2x_code_datascience_notebook:
needs: [code_datascience_notebook]
uses: ./.github/workflows/build_e2xgrader_images.yml
with:
force_build: ${{ inputs.force_build || needs.code_datascience_notebook.outputs.did_build_image == 'true' }}
registry: ${{ inputs.registry }}
image_name: datascience-notebook-code
image_tag: ${{ inputs.tag }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/datasience-notebook-code
base_image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
e2xgrader_installation_source: ${{ inputs.e2xgrader_installation_source }}
e2xgrader_version: ${{ inputs.e2xgrader_version }}
e2xgrader_branch: ${{ inputs.e2xgrader_branch }}
secrets: inherit

ml_notebook:
needs: [datascience_notebook]
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.datascience_notebook.outputs.did_build_image == 'true' }}
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/datascience-notebook
base_image_tag: ${{ inputs.tag }}
base_image_tag: ${{ inputs.tag }}
image_path: images/ml-notebook
image_name: ml-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

Expand All @@ -190,11 +226,12 @@ jobs:
uses: ./.github/workflows/build_image.yml
with:
force_build: ${{ inputs.force_build || needs.ml_notebook.outputs.did_build_image == 'true' }}
image_name: nlp-notebook
image_tag: ${{ inputs.tag }}
registry: ${{ inputs.registry }}
base_image_name: ${{ inputs.registry }}/digiklausur/docker-stacks/ml-notebook
base_image_tag: ${{ inputs.tag }}
base_image_tag: ${{ inputs.tag }}
image_path: images/nlp-notebook
image_name: nlp-notebook
image_tag: ${{ inputs.tag }}
push: ${{ inputs.push }}
secrets: inherit

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/build_image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ on:
type: string
required: false
default: latest
image_path:
description: The path to the Dockerfile and other files needed to build the image
type: string
required: true
outputs:
did_build_image:
description: If the image was built
Expand All @@ -67,7 +71,7 @@ jobs:
with:
filters: |
image_changed:
images/${{ inputs.image_name }}/!(README.md)
${{ inputs.image_path }}/!(README.md)
base: ${{ github.ref }}
- name: Login to ghcr.io
if: ${{ inputs.registry == 'ghcr.io' }}
Expand All @@ -88,7 +92,7 @@ jobs:
id: build_image
uses: docker/build-push-action@v5
with:
context: images/${{ inputs.image_name }}
context: ${{ inputs.image_path }}
push: ${{ inputs.push }}
tags: ${{ inputs.registry }}/digiklausur/docker-stacks/${{ inputs.image_name }}:${{ inputs.image_tag }}
build-args: |
Expand Down

0 comments on commit 540b864

Please sign in to comment.