Using ghcr.io/home-assistant + fallback (#2959)

supervisor/addons/build.py

@@ -48,7 +48,7 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
     def base_image(self) -> str:
         """Return base image for this add-on."""
         if not self._data[ATTR_BUILD_FROM]:
-            return f"homeassistant/{self.sys_arch.default}-base:latest"
+            return f"ghcr.io/home-assistant/{self.sys_arch.default}-base:latest"
 
         # Evaluate correct base image
         arch = self.sys_arch.match(list(self._data[ATTR_BUILD_FROM].keys()))

supervisor/homeassistant/module.py

@@ -144,7 +144,7 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes):
         """Return image name of the Home Assistant container."""
         if self._data.get(ATTR_IMAGE):
             return self._data[ATTR_IMAGE]
-        return f"homeassistant/{self.sys_machine}-homeassistant"
+        return f"ghcr.io/home-assistant/{self.sys_machine}-homeassistant"
 
     @image.setter
     def image(self, value: str) -> None:

supervisor/plugins/base.py

@@ -29,7 +29,7 @@ class PluginBase(ABC, FileConfiguration, CoreSysAttributes):
         """Return current image of plugin."""
         if self._data.get(ATTR_IMAGE):
             return self._data[ATTR_IMAGE]
-        return f"homeassistant/{self.sys_arch.supervisor}-hassio-{self.slug}"
+        return f"ghcr.io/home-assistant/{self.sys_arch.supervisor}-hassio-{self.slug}"
 
     @image.setter
     def image(self, value: str) -> None:

tests/addons/test_config.py

@@ -87,7 +87,7 @@ def test_invalid_repository():
     with pytest.raises(vol.Invalid):
         vd.SCHEMA_ADDON_CONFIG(config)
 
-    config["image"] = "homeassistant/no-valid-repo:no-tag-allow"
+    config["image"] = "ghcr.io/home-assistant/no-valid-repo:no-tag-allow"
     with pytest.raises(vol.Invalid):
         vd.SCHEMA_ADDON_CONFIG(config)
 

tests/conftest.py

@@ -34,7 +34,7 @@ async def mock_async_return_true() -> bool:
 @pytest.fixture
 def docker() -> DockerAPI:
     """Mock DockerAPI."""
-    images = [MagicMock(tags=["homeassistant/amd64-hassio-supervisor:latest"])]
+    images = [MagicMock(tags=["ghcr.io/home-assistant/amd64-hassio-supervisor:latest"])]
 
     with patch("docker.DockerClient", return_value=MagicMock()), patch(
         "supervisor.docker.DockerAPI.images", return_value=MagicMock()

tests/fixtures/basic-build-config.json

@@ -2,10 +2,10 @@
   "build_from": {
     "armhf": "mycustom/base-image:latest",
     "aarch64": "mycustom/base-image",
-    "amd64": "homeassistant/amd64-base-ubuntu:18.04"
+    "amd64": "ghcr.io/home-assistant/amd64-base-ubuntu:18.04"
   },
   "squash": false,
   "args": {
     "my_build_arg": "xy"
   }
-}
+}