From 7ff893fbd3b596c3bfa3d0f4169bbdd1c9e528f0 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 3 Jan 2024 11:05:55 -0800 Subject: [PATCH] docker: switch to ghcr --- install/docker/Dockerfile | 2 +- install/docker/Dockerfile.HEAD | 2 +- install/docker/Dockerfile.local | 2 +- install/docker/Dockerfile.nvidia | 2 +- install/docker/Dockerfile.s6 | 2 +- install/docker/docker-build-local.sh | 4 ++-- install/docker/docker-build-nvidia.sh | 2 +- install/docker/docker-build.sh | 4 ++-- install/docker/docker-compose.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/install/docker/Dockerfile b/install/docker/Dockerfile index 48adb114c..6f8b00dbd 100644 --- a/install/docker/Dockerfile +++ b/install/docker/Dockerfile @@ -1,5 +1,5 @@ ARG BASE="18-jammy-full" -FROM koush/scrypted-common:${BASE} +FROM ghcr.io/koush/scrypted-common:${BASE} WORKDIR / # cache bust diff --git a/install/docker/Dockerfile.HEAD b/install/docker/Dockerfile.HEAD index 1ad3be782..8273ae82d 100644 --- a/install/docker/Dockerfile.HEAD +++ b/install/docker/Dockerfile.HEAD @@ -1,5 +1,5 @@ ARG BASE="16-jammy" -FROM koush/scrypted-common:${BASE} +FROM ghcr.io/koush/scrypted-common:${BASE} WORKDIR / RUN git clone --depth=1 https://github.com/koush/scrypted diff --git a/install/docker/Dockerfile.local b/install/docker/Dockerfile.local index 97a364737..c421e8ec8 100644 --- a/install/docker/Dockerfile.local +++ b/install/docker/Dockerfile.local @@ -1,4 +1,4 @@ -FROM koush/scrypted-common +FROM ghcr.io/koush/scrypted-common WORKDIR / COPY . . diff --git a/install/docker/Dockerfile.nvidia b/install/docker/Dockerfile.nvidia index 86a318cf8..af2c35ec6 100644 --- a/install/docker/Dockerfile.nvidia +++ b/install/docker/Dockerfile.nvidia @@ -1,4 +1,4 @@ -FROM koush/18-jammy-full.s6 +FROM ghcr.io/koush/18-jammy-full.s6 WORKDIR / diff --git a/install/docker/Dockerfile.s6 b/install/docker/Dockerfile.s6 index 7fef5c951..7f8f18d6b 100644 --- a/install/docker/Dockerfile.s6 +++ b/install/docker/Dockerfile.s6 @@ -1,5 +1,5 @@ ARG BASE="18-jammy-full" -FROM koush/scrypted-common:${BASE} +FROM ghcr.io/koush/scrypted-common:${BASE} # avahi advertiser support RUN apt-get update && apt-get -y install \ diff --git a/install/docker/docker-build-local.sh b/install/docker/docker-build-local.sh index 0331769f8..fbd9972e6 100755 --- a/install/docker/docker-build-local.sh +++ b/install/docker/docker-build-local.sh @@ -1,4 +1,4 @@ ./template/generate-dockerfile.sh -docker build -t koush/scrypted-common -f Dockerfile.full . && \ -docker build -t koush/scrypted -f Dockerfile.local . +docker build -t ghcr.io/koush/scrypted-common -f Dockerfile.full . && \ +docker build -t ghcr.io/koush/scrypted -f Dockerfile.local . diff --git a/install/docker/docker-build-nvidia.sh b/install/docker/docker-build-nvidia.sh index b9094d595..4ecc2155e 100755 --- a/install/docker/docker-build-nvidia.sh +++ b/install/docker/docker-build-nvidia.sh @@ -1,3 +1,3 @@ ./docker-build.sh -docker build -t koush/scrypted:18-jammy-full.nvidia -f Dockerfile.nvidia +docker build -t ghcr.io/koush/scrypted:18-jammy-full.nvidia -f Dockerfile.nvidia diff --git a/install/docker/docker-build.sh b/install/docker/docker-build.sh index 2fda9861f..f72ca6f7c 100755 --- a/install/docker/docker-build.sh +++ b/install/docker/docker-build.sh @@ -11,8 +11,8 @@ echo $BASE SUPERVISOR=.s6 SUPERVISOR_BASE=$BASE$SUPERVISOR -docker build -t koush/scrypted-common:$BASE -f Dockerfile.$FLAVOR \ +docker build -t ghcr.io/koush/scrypted-common:$BASE -f Dockerfile.$FLAVOR \ --build-arg NODE_VERSION=$NODE_VERSION --build-arg BASE=$IMAGE_BASE . && \ \ -docker build -t koush/scrypted:$SUPERVISOR_BASE -f Dockerfile$SUPERVISOR \ +docker build -t ghcr.io/koush/scrypted:$SUPERVISOR_BASE -f Dockerfile$SUPERVISOR \ --build-arg BASE=$BASE --build-arg SCRYPTED_INSTALL_VERSION=$SCRYPTED_INSTALL_VERSION . diff --git a/install/docker/docker-compose.yml b/install/docker/docker-compose.yml index 5477971c7..c5e8fe121 100644 --- a/install/docker/docker-compose.yml +++ b/install/docker/docker-compose.yml @@ -90,7 +90,7 @@ services: container_name: scrypted restart: unless-stopped network_mode: host - image: koush/scrypted + image: ghcr.io/koush/scrypted # logging is noisy and will unnecessarily wear on flash storage. # scrypted has per device in memory logging that is preferred.