diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ada42dcd3..05c5c5304 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,10 +22,8 @@ jobs: BASE: [ # "18-jammy-full", # "18-jammy-lite", - # "18-jammy-thin", "20-jammy-full", "20-jammy-lite", - # "20-jammy-thin", ] SUPERVISOR: ["", ".s6"] steps: @@ -88,16 +86,12 @@ jobs: ${{ matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '.s6' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }} ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '' && 'koush/scrypted:full' || '' }} ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '' && 'koush/scrypted:lite' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-thin' && matrix.SUPERVISOR == '' && 'koush/scrypted:thin' || '' }} ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:lite-s6' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-thin' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:thin-s6' || '' }} ${{ format('ghcr.io/koush/scrypted:{0}{1}-v{2}', matrix.BASE, matrix.SUPERVISOR, github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }} ${{ matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '.s6' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }} ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:full' || '' }} ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:lite' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-thin' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:thin' || '' }} ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:lite-s6' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-thin' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:thin-s6' || '' }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/server/package-lock.json b/server/package-lock.json index f0e5717d7..c8f7de7a6 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.94.6", + "version": "0.94.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.94.6", + "version": "0.94.7", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.11",