Skip to content

fix: tags #754

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

Merged
EveningStarlight merged 3 commits into from
Jun 4, 2025
Merged

fix: tags #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f25791
code tag as v1 not master
EveningStarlight Mar 10, 2025
af47fbd
make test use passed tag
EveningStarlight Mar 10, 2025
629f65b
tag instead of branch name in some workflows
EveningStarlight Mar 10, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/docker-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
outputs:
REGISTRY_NAME: "k8scc01covidacr.azurecr.io"
branch-name: "v1"
TAG: "v1"
steps:
- uses: actions/checkout@v4

Expand All @@ -30,7 +30,7 @@ jobs:
with:
image: ${{ matrix.image }}
registry-name: "${{ needs.vars.outputs.REGISTRY_NAME }}"
branch-name: "${{ needs.vars.outputs.branch-name }}"
tag: "${{ needs.vars.outputs.TAG }}"
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-pull-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
description: url of the registry <registy-name>
required: true
type: string
branch-name:
description: The name of the current branch
tag:
description: The tag of the image
required: true
type: string
secrets:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Pull existing image
id: pull-existing
run: make pull/${{ inputs.image }} REPO=${{ inputs.registry-name }} TAG=${{ inputs.branch-name }}
run: make pull/${{ inputs.image }} REPO=${{ inputs.registry-name }} TAG=${{ inputs.tag }}

- name: Set Up Python for Test Suite
uses: actions/setup-python@v4
Expand All @@ -72,7 +72,7 @@ jobs:
make install-python-dev-venv

- name: Test image
run: make test/${{ inputs.image }}
run: make test/${{ inputs.image }} TAG=${{ inputs.tag }}

# Free up space from build process (containerscan action will run out of space if we don't)
- name: cleanup runner
Expand All @@ -96,7 +96,7 @@ jobs:
trivy image \
--db-repository ${{ env.TRIVY_DATABASES }} \
--java-db-repository ${{ env.TRIVY_JAVA_DATABASES }} \
${{ inputs.registry-name }}/${{ inputs.image }}:${{ inputs.branch-name }} \
${{ inputs.registry-name }}/${{ inputs.image }}:${{ inputs.tag }} \
--exit-code 10 --timeout=20m --scanners vuln --severity CRITICAL --quiet
EXIT_CODE=$?

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-pull-upload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Pull existing image
id: pull-existing
run: make pull/${{ inputs.image }} REPO=${{ inputs.registry-name }} TAG=master
run: make pull/${{ inputs.image }} REPO=${{ inputs.registry-name }} TAG=v1

- name: Retag existing image
run: make post-build/${{ inputs.image }} REPO=${{ inputs.registry-name }} SOURCE_FULL_IMAGE_NAME=${{ steps.pull-existing.outputs.image_name }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
with:
image: "jupyterlab-cpu"
registry-name: "${{ needs.vars.outputs.REGISTRY_NAME }}"
branch-name: "${{ needs.vars.outputs.branch-name }}"
tag: "${{ needs.vars.outputs.branch-name }}"
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
Expand All @@ -216,7 +216,7 @@ jobs:
with:
image: "jupyterlab-tensorflow"
registry-name: "${{ needs.vars.outputs.REGISTRY_NAME }}"
branch-name: "${{ needs.vars.outputs.branch-name }}"
tag: "${{ needs.vars.outputs.branch-name }}"
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
Expand All @@ -228,7 +228,7 @@ jobs:
with:
image: "rstudio"
registry-name: "${{ needs.vars.outputs.REGISTRY_NAME }}"
branch-name: "${{ needs.vars.outputs.branch-name }}"
tag: "${{ needs.vars.outputs.branch-name }}"
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
Expand All @@ -240,7 +240,7 @@ jobs:
with:
image: "sas"
registry-name: "${{ needs.vars.outputs.REGISTRY_NAME }}"
branch-name: "${{ needs.vars.outputs.branch-name }}"
tag: "${{ needs.vars.outputs.branch-name }}"
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
Expand All @@ -252,7 +252,7 @@ jobs:
with:
image: "remote-desktop"
registry-name: "${{ needs.vars.outputs.REGISTRY_NAME }}"
branch-name: "${{ needs.vars.outputs.branch-name }}"
tag: "${{ needs.vars.outputs.branch-name }}"
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ Tests are formatted using typical pytest formats (python files with `def test_SO
```
username@hostname:~$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
k8scc01covidacr.azurecr.io/jupyterlab-tensorflow master 13f8dc0e4f7a 26 minutes ago 14.6GB
k8scc01covidacr.azurecr.io/jupyterlab-pytorch master 2b9acb795079 19 hours ago 15.5GB
k8scc01covidacr.azurecr.io/jupyterlab-tensorflow v1 13f8dc0e4f7a 26 minutes ago 14.6GB
k8scc01covidacr.azurecr.io/jupyterlab-pytorch v1 2b9acb795079 19 hours ago 15.5GB
jupyter/datascience-notebook 9ed3b8de5de1 9a0c8d86de1a 5 weeks ago 4.25GB
```

Expand Down