Use ghcr for supervisor and builder (#46)

home-assistant · Jul 18, 2023 · 06bb8ac · 06bb8ac
1 parent 636f90b
commit 06bb8ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/addons/rootfs/usr/bin/supervisor_run b/addons/rootfs/usr/bin/supervisor_run
@@ -26,7 +26,7 @@ function run_supervisor() {
         -e SUPERVISOR_NAME=hassio_supervisor \
         -e SUPERVISOR_DEV=1 \
         -e SUPERVISOR_MACHINE="qemu${QEMU_ARCH}" \
-        "homeassistant/${HA_ARCH}-hassio-supervisor:${SUPERVISOR_VERSION}"
+        "${SUPERVISOR_IMAGE}:${SUPERVISOR_VERSION}"
 }
 
 

diff --git a/common/rootfs_supervisor/etc/supervisor_scripts/common b/common/rootfs_supervisor/etc/supervisor_scripts/common
@@ -2,13 +2,16 @@
 
 set -e
 
-export SUPERVISOR_VERSION="$(curl -s https://version.home-assistant.io/dev.json | jq -e -r '.supervisor')"
+VERSION_INFO=$(curl -s https://version.home-assistant.io/dev.json)
 HA_ARCH=$(get_arch ha)
 QEMU_ARCH=$(get_arch qemu)
 DOCKER_TIMEOUT=30
 DOCKER_PID=0
 WD="${WORKSPACE_DIRECTORY:=/workspaces/supervisor}"
 
+export SUPERVISOR_VERSION="$(echo ${VERSION_INFO} | jq -e -r '.supervisor')"
+export SUPERVISOR_IMAGE="$(sed "s/{arch}/${HA_ARCH}/g" <<< "$(echo ${VERSION_INFO} | jq -e -r '.images.supervisor')")"
+
 
 function start_docker() {
     local starttime
@@ -78,13 +81,13 @@ function cleanup_lastboot() {
 }
 
 function build_supervisor() {
-    docker pull "homeassistant/${HA_ARCH}-builder:dev"
+    docker pull "ghcr.io/home-assistant/${HA_ARCH}-builder:dev"
 
     docker run --rm \
         --privileged \
         -v /run/docker.sock:/run/docker.sock \
         -v "$(pwd):/data" \
-        "homeassistant/${HA_ARCH}-builder:dev" \
+        "ghcr.io/home-assistant/${HA_ARCH}-builder:dev" \
             --generic latest \
             --target /data \
             --test \
@@ -117,7 +120,7 @@ function run_supervisor() {
         -e SUPERVISOR_NAME="hassio_supervisor" \
         -e SUPERVISOR_DEV=1 \
         -e SUPERVISOR_MACHINE="qemu${QEMU_ARCH}" \
-        "homeassistant/${HA_ARCH}-hassio-supervisor:latest"
+        "${SUPERVISOR_IMAGE}:latest"
 }
 
 function init_dbus() {