From 448e2c4e6e03cc8b76193d906a5ee68ab7482e49 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 8 Mar 2025 23:51:15 -0800 Subject: [PATCH] router: fix names --- .github/workflows/docker.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 085608652..fe71ea4fb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,10 +20,10 @@ jobs: strategy: matrix: BASE: [ - ["noble-nvidia", ".s6"], - ["noble-full", ".s6"], - ["noble-lite", ""], - ["noble-lite", ".router"], + ["noble-nvidia", ".s6", "noble-nvidia"], + ["noble-full", ".s6", "noble-full"], + ["noble-lite", "", "noble-lite"], + ["noble-lite", ".router", "noble-router"], ] steps: - name: Check out the repo @@ -95,18 +95,18 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ${{ format('koush/scrypted:v{1}-{0}', matrix.BASE[0], github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }} - ${{ matrix.BASE[0] == 'noble-full' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-nvidia' && 'koush/scrypted:nvidia' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-full' && 'koush/scrypted:full' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-lite' && matrix.BASE[1] == '' && 'koush/scrypted:lite' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-lite' && matrix.BASE[1] == '.router' && 'koush/scrypted:router' || '' }} + ${{ format('koush/scrypted:v{1}-{0}', matrix.BASE[2], github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }} + ${{ matrix.BASE[2] == 'noble-full' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-nvidia' && 'koush/scrypted:nvidia' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-full' && 'koush/scrypted:full' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-lite' && matrix.BASE[1] == '' && 'koush/scrypted:lite' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-router' && 'koush/scrypted:router' || '' }} ${{ format('ghcr.io/koush/scrypted:v{1}-{0}', matrix.BASE[0], github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }} - ${{ matrix.BASE[0] == 'noble-full' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-nvidia' && 'ghcr.io/koush/scrypted:nvidia' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-full' && 'ghcr.io/koush/scrypted:full' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-lite' && matrix.BASE[1] == '' && 'ghcr.io/koush/scrypted:lite' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'noble-lite' && matrix.BASE[1] == '.router' && 'ghcr.io/koush/scrypted:router' || '' }} + ${{ matrix.BASE[2] == 'noble-full' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-nvidia' && 'ghcr.io/koush/scrypted:nvidia' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-full' && 'ghcr.io/koush/scrypted:full' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-lite' && matrix.BASE[1] == '' && 'ghcr.io/koush/scrypted:lite' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE[2] == 'noble-lite' && 'ghcr.io/koush/scrypted:router' || '' }} cache-from: type=gha cache-to: type=gha,mode=max