diff --git a/.github/workflows/docker-nightly.yaml b/.github/workflows/docker-nightly.yaml index 56cbd5bc7..1d9abaf95 100644 --- a/.github/workflows/docker-nightly.yaml +++ b/.github/workflows/docker-nightly.yaml @@ -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 @@ -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 }} diff --git a/.github/workflows/docker-pull-test.yaml b/.github/workflows/docker-pull-test.yaml index 071e79053..227af81ae 100644 --- a/.github/workflows/docker-pull-test.yaml +++ b/.github/workflows/docker-pull-test.yaml @@ -14,8 +14,8 @@ on: description: url of the registry 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: @@ -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 @@ -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 @@ -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=$? diff --git a/.github/workflows/docker-pull-upload.yaml b/.github/workflows/docker-pull-upload.yaml index 4345e00e4..de9a77254 100644 --- a/.github/workflows/docker-pull-upload.yaml +++ b/.github/workflows/docker-pull-upload.yaml @@ -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 }} diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 53c26fce4..1ed77f094 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -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 }} @@ -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 }} @@ -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 }} @@ -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 }} @@ -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 }} diff --git a/README.md b/README.md index 674e7aa12..9ae21b36c 100644 --- a/README.md +++ b/README.md @@ -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 ```