Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update ci not releasing jupyterhub container #65

Merged
merged 4 commits into from
Oct 31, 2023
Merged

fix: Update ci not releasing jupyterhub container #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdf277b
fix: Update ci not releasing jupyterhub container
JossWhittle Oct 31, 2023
0715c82
fix: Update ci not building container properly
JossWhittle Oct 31, 2023
7ce97cf
feat: remove stub chart from repo as we are using our central jupyter…
JossWhittle Oct 31, 2023
96ee318
fix: plumbing
JossWhittle Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions .github/workflows/on-pr-update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,24 @@ jobs:
with:
slack-channel: ${{ vars.SLACK_CHANNEL }}
filters: |
container:
jupyter-container:
- './.github/workflows/on-pr-update.yaml'
- 'containers/**'
chart:
- './.github/workflows/on-pr-update.yaml'
- 'charts/**'
- 'containers/jupyterlab/**'
- 'containers/custom-packages/**'
- 'containers/files/**'
jupyterhub-container:
- './.github/workflows/on-pr-update.yaml'
- 'containers/jupyterhub/**'
- 'containers/custom-packages/**'
- 'containers/files/**'

secrets:
slack-token: ${{ secrets.SLACK_TOKEN }}

jupyterhub-container:
# Build the container and push it as :pr-42 and :pr-42-fe45b3h
needs: changes
if: fromJSON(needs.changes.outputs.changes).container == 'true'
if: fromJSON(needs.changes.outputs.changes).jupyterhub-container == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/[email protected]
with:
job-name: jupyterhub-container
Expand All @@ -59,14 +63,14 @@ jobs:
jupyterlab-standard-container:
# Build the container and push it as :pr-42 and :pr-42-fe45b3h
needs: changes
if: fromJSON(needs.changes.outputs.changes).container == 'true'
if: fromJSON(needs.changes.outputs.changes).jupyter-container == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/[email protected]
with:
job-name: jupyterlab-standard-container
container-registry: ${{ vars.HARBOR_REGISTRY }}
container-registry-user: ${{ vars.HARBOR_USER }}
container-registry-project: ${{ vars.HARBOR_PROJECT }}
container-registry-repo: ${{ vars.HARBOR_REPO }}
container-registry-repo: jupyter
slack-channel: ${{ vars.SLACK_CHANNEL }}
build-command: |
sudo apt update &&
Expand All @@ -78,22 +82,3 @@ jobs:
secrets:
container-registry-token: ${{ secrets.HARBOR_TOKEN }}
slack-token: ${{ secrets.SLACK_TOKEN }}

chart:
# Build the chart and push it as :pr-42 and :pr-42-fe45b3h
needs: changes
if: fromJSON(needs.changes.outputs.changes).chart == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/[email protected]
with:
job-name: chart
chart: charts/**
chart-registry: ${{ vars.HARBOR_REGISTRY }}
chart-registry-user: ${{ vars.HARBOR_USER }}
chart-registry-project: ${{ vars.HARBOR_PROJECT }}
chart-registry-repo: ${{ vars.HARBOR_REPO }}
slack-channel: ${{ vars.SLACK_CHANNEL }}
test-command: |
helm template $CHART --values charts/jupyter/values.yaml
secrets:
chart-registry-token: ${{ secrets.HARBOR_TOKEN }}
slack-token: ${{ secrets.SLACK_TOKEN }}
53 changes: 26 additions & 27 deletions .github/workflows/on-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,18 @@ jobs:
filters: |
jupyter-container:
- './.github/workflows/on-release.yaml'
- 'containers/**'
- 'plugins/**'
chart:
- 'containers/jupyterlab/**'
- 'containers/custom-packages/**'
- 'containers/files/**'
jupyterhub-container:
- './.github/workflows/on-release.yaml'
- 'charts/**'
- 'containers/jupyterhub/**'
- 'containers/custom-packages/**'
- 'containers/files/**'

secrets:
slack-token: ${{ secrets.SLACK_TOKEN }}

######################################################################################################################
# Container Tasks
######################################################################################################################

jupyter-container:
# Build the DARE Jupyter container and push it as :rc-1.0.0
needs: changes
Expand All @@ -47,7 +46,7 @@ jobs:
container-registry: ${{ vars.HARBOR_REGISTRY }}
container-registry-user: ${{ vars.HARBOR_USER }}
container-registry-project: ${{ vars.HARBOR_PROJECT }}
container-registry-repo: ${{ vars.HARBOR_REPO }}
container-registry-repo: jupyter
release-tag-format: 'DARE-Jupyter-Container-${version}'
slack-channel: ${{ vars.SLACK_CHANNEL }}
build-command: |
Expand All @@ -61,26 +60,26 @@ jobs:
container-registry-token: ${{ secrets.HARBOR_TOKEN }}
slack-token: ${{ secrets.SLACK_TOKEN }}

######################################################################################################################
# Chart Tasks
######################################################################################################################

chart:
# Build the chart and push it as x.y.z-rc
jupyterhub-container:
# Build the DARE Jupyter container and push it as :rc-1.0.0
needs: changes
if: fromJSON(needs.changes.outputs.changes).chart == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-release-chart[email protected]
if: fromJSON(needs.changes.outputs.changes).jupyterhub-container == 'true'
uses: SwanseaUniversityMedical/workflows/.github/workflows/on-release-container[email protected]
with:
job-name: chart
chart-registry: ${{ vars.HARBOR_REGISTRY }}
chart-registry-user: ${{ vars.HARBOR_USER }}
chart-registry-project: ${{ vars.HARBOR_PROJECT }}
chart-registry-repo: ${{ vars.HARBOR_REPO }}
release-tag-format: 'DARE-Jupyter-Helm-${version}'
job-name: jupyterhub-container
container-registry: ${{ vars.HARBOR_REGISTRY }}
container-registry-user: ${{ vars.HARBOR_USER }}
container-registry-project: ${{ vars.HARBOR_PROJECT }}
container-registry-repo: jupyterhub
release-tag-format: 'DARE-Jupyterhub-Container-${version}'
slack-channel: ${{ vars.SLACK_CHANNEL }}
chart: charts/**
test-command: |
helm template $CHART --values charts/jupyter/values.yaml
build-command: |
sudo apt update &&
sudo apt install python3.8-venv &&
python -m pip install --user --upgrade build &&
python -m build --outdir ./dist ./containers/custom-packages/jupyter-cloudbeaver-proxy &&
python -m build --outdir ./dist ./containers/custom-packages/jupyter-rsession-proxy &&
docker build -t $IMAGE -f containers/jupyterhub/Dockerfile .
secrets:
chart-registry-token: ${{ secrets.HARBOR_TOKEN }}
container-registry-token: ${{ secrets.HARBOR_TOKEN }}
slack-token: ${{ secrets.SLACK_TOKEN }}
23 changes: 0 additions & 23 deletions charts/jupyter/.helmignore
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions charts/jupyter/Chart.yaml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions charts/jupyter/values.yaml
View file
Open in desktop

This file was deleted.

Empty file removed containers/jupyterlab/gpu.Dockerfile
View file
Open in desktop
Empty file.
Empty file removed containers/jupyterlab/sparkR.Dockerfile
View file
Open in desktop
Empty file.
Loading