Merge branch 'main' of github.com:koush/scrypted

This commit is contained in:
Koushik Dutta
2022-12-19 17:05:46 -08:00
2 changed files with 7 additions and 4 deletions

View File

@@ -68,16 +68,16 @@ jobs:
push: true
tags: |
koush/scrypted:${{ matrix.BASE }}${{ matrix.SUPERVISOR }}
${{ format('koush/scrypted:v{0}{1}', github.event.inputs.package_version || steps.package-version.outputs.current-version, matrix.SUPERVISOR) || '' }}
${{ format('koush/scrypted:v{0}-{1}{2}', github.event.inputs.package_version || steps.package-version.outputs.current-version, matrix.BASE, matrix.SUPERVISOR) }}
ghcr.io/koush/scrypted:${{ matrix.BASE }}${{ matrix.SUPERVISOR }}
${{ format('ghcr.io/koush/scrypted:v{0}{1}', github.event.inputs.package_version || steps.package-version.outputs.current-version, matrix.SUPERVISOR) || '' }}
${{ format('ghcr.io/koush/scrypted:v{0}-{1}{2}', github.event.inputs.package_version || steps.package-version.outputs.current-version, matrix.BASE, matrix.SUPERVISOR) }}
${{ matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '.s6' && format('koush/scrypted:{0}', github.event.inputs.docker_tag) || '' }}
${{ matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '.s6' && format('koush/scrypted:{0}', github.event.inputs.docker_tag) }}
${{ matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '' && 'koush/scrypted:lite' || '' }}
${{ matrix.BASE == '18-bullseye-thin' && matrix.SUPERVISOR == '' && 'koush/scrypted:thin' || '' }}
${{ matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '.s6' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.docker_tag) || '' }}
${{ matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '.s6' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.docker_tag) }}
${{ matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:lite' || '' }}
${{ matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:thin' || '' }}
cache-from: type=gha

View File

@@ -1,5 +1,8 @@
version: "3.5"
# The Scrypted docker-compose.yml file typically resides at:
# ~/.scrypted/docker-compose.yml
services:
scrypted:
environment: