Remove machine spesific image refrences (home-assistant#20678)

hco · Dec 13, 2021 · fa2bf2d · fa2bf2d
1 parent 4db4431
commit fa2bf2d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 46 deletions.
diff --git a/_config.yml b/_config.yml
@@ -178,10 +178,7 @@ toc:
 
 # Configuration for installation pages
 installation:
-  container:
-    base: "ghcr.io/home-assistant/home-assistant"
-    raspberrypi3: "ghcr.io/home-assistant/raspberrypi3-homeassistant"
-    raspberrypi4: "ghcr.io/home-assistant/raspberrypi4-homeassistant"
+  container: "ghcr.io/home-assistant/home-assistant"
   versions:
     python: "3.9"
   types:

diff --git a/source/_includes/common-tasks/beta_version.md b/source/_includes/common-tasks/beta_version.md
@@ -40,7 +40,7 @@ If you would like to test next release before anyone else, you can install the b
 {% elsif page.installation == "container" %}
 
 ```bash
-docker pull {{ site.installation.container.base }}:beta
+docker pull {{ site.installation.container }}:beta
 ```
 
 **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**

diff --git a/source/_includes/common-tasks/development_version.md b/source/_includes/common-tasks/development_version.md
@@ -31,7 +31,7 @@ If you want to stay on the bleeding-edge Home Assistant Core development branch,
 {% elsif page.installation == "container" %}
 
 ```bash
-docker pull {{ site.installation.container.base }}:dev
+docker pull {{ site.installation.container }}:dev
 ```
 
 **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**

diff --git a/source/_includes/common-tasks/specific_version.md b/source/_includes/common-tasks/specific_version.md
@@ -13,7 +13,7 @@ ha core update --version {{current_version}}
 {% elsif page.installation == "container" %}
 
 ```bash
-docker pull {{ site.installation.container.base }}:{{current_version}}
+docker pull {{ site.installation.container }}:{{current_version}}
 ```
 
 **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**

diff --git a/source/_includes/common-tasks/update.md b/source/_includes/common-tasks/update.md
@@ -44,13 +44,7 @@ To update Home Assistant Core when you run Home Assistant {{ page.installation_n
     **First start with pulling the new container.**
 
     ```bash
-    docker pull {{ site.installation.container.base }}:stable
-    ```
-
-    You can also use specific containers for your hardware. Like Raspberry Pi 4:
-
-    ```bash
-    docker pull {{ site.installation.container.raspberrypi4 }}:stable
+    docker pull {{ site.installation.container }}:stable
     ```
 
     **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**

diff --git a/source/_includes/installation/container.md b/source/_includes/installation/container.md
@@ -20,18 +20,8 @@ Installation with Docker is straightforward. Adjust the following command so tha
 
 {% endif %}
 
-{% if page.installation_type == 'raspberrypi' %}
-#### Raspberry pi 3
-
-  {% include installation/container/cli.md image=site.installation.container.raspberrypi3 %}
-
-#### Raspberry pi 4
-
-  {% include installation/container/cli.md image=site.installation.container.raspberrypi4 %}
-
-{% elsif page.installation_type == 'alternative' %}
+{% if page.installation_type == 'alternative' %}
   {% include installation/container/alternative.md %}
-
 {% else %}
   {% include installation/container/cli.md %}
 {% endif %}
@@ -76,17 +66,7 @@ If you change the configuration you have to restart the server. To do that you h
 
 As the Docker command becomes more complex, switching to `docker-compose` can be preferable and support automatically restarting on failure or system restart. Create a `docker-compose.yml` file:
 
-{% if page.installation_type == 'raspberrypi' %}
-#### Raspberry pi 3
-
-  {% include installation/container/compose.md image=site.installation.container.raspberrypi3 %}
-
-#### Raspberry pi 4
-
-  {% include installation/container/compose.md image=site.installation.container.raspberrypi4 %}
-{% else %}
-  {% include installation/container/compose.md %}
-{% endif %}
+{% include installation/container/compose.md %}
 
 Start it by running:
 

diff --git a/source/_includes/installation/container/alternative.md b/source/_includes/installation/container/alternative.md
@@ -42,7 +42,7 @@ Adjust the following Terminal command as follows :
 Run it in Terminal.
 
 ```bash
-sudo docker run --restart always -d --name homeassistant -v /PATH_TO_YOUR_CONFIG:/config --device=/PATH_TO_YOUR_USB_STICK -e TZ=Australia/Melbourne --net=host {{ site.installation.container.base }}:stable
+sudo docker run --restart always -d --name homeassistant -v /PATH_TO_YOUR_CONFIG:/config --device=/PATH_TO_YOUR_USB_STICK -e TZ=Australia/Melbourne --net=host {{ site.installation.container }}:stable
 ```
 
 Complete the remainder of the Z-Wave configuration by [following the instructions here.](/integrations/zwave_js)
@@ -104,7 +104,7 @@ If you want to use a USB Bluetooth adapter or Z-Wave USB stick with Home Assista
 - Run Docker command:
 
   ```bash
-  docker run --init --name homeassistant --net=host --privileged -itd -v /share/CACHEDEV1_DATA/Public/homeassistant/config:/config -e TZ=Europe/London --device /dev/ttyACM0 {{ site.installation.container.base }}:stable
+  docker run --init --name homeassistant --net=host --privileged -itd -v /share/CACHEDEV1_DATA/Public/homeassistant/config:/config -e TZ=Europe/London --device /dev/ttyACM0 {{ site.installation.container }}:stable
   ```
 
   `-v` is your configuration path
@@ -125,7 +125,7 @@ That will tell Home Assistant where to look for our Z-Wave radio.
 - Run Docker command:
 
   ```bash
-  docker run --init --name homeassistant --net=host --privileged -itd -v /share/CACHEDEV1_DATA/Public/homeassistant/config:/config -e TZ=Europe/London -v /dev/bus/usb:/dev/bus/usb -v /var/run/dbus:/var/run/dbus {{ site.installation.container.base }}:stable
+  docker run --init --name homeassistant --net=host --privileged -itd -v /share/CACHEDEV1_DATA/Public/homeassistant/config:/config -e TZ=Europe/London -v /dev/bus/usb:/dev/bus/usb -v /var/run/dbus:/var/run/dbus {{ site.installation.container }}:stable
   ```
 
   First `-v` is your configuration path

diff --git a/source/_includes/installation/container/cli.md b/source/_includes/installation/container/cli.md
@@ -11,15 +11,15 @@
       -e TZ=MY_TIME_ZONE \
       -v /PATH_TO_YOUR_CONFIG:/config \
       --network=host \
-      {{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}
+      {{ site.installation.container }}:{{ include.tag | default: 'stable' }}
     ```
 
 - title: Update
   content: |
 
     ```bash
     # if this returns "Image is up to date" then you can stop here
-    docker pull {{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}
+    docker pull {{ site.installation.container }}:{{ include.tag | default: 'stable' }}
     ```
 
     ```bash
@@ -41,7 +41,7 @@
       -e TZ=MY_TIME_ZONE \
       -v /PATH_TO_YOUR_CONFIG:/config \
       --network=host \
-      {{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}
+      {{ site.installation.container }}:{{ include.tag | default: 'stable' }}
     ```
 
 {% endtabbed_block %}
diff --git a/source/_includes/installation/container/compose.md b/source/_includes/installation/container/compose.md
@@ -3,7 +3,7 @@
   services:
     homeassistant:
       container_name: homeassistant
-      image: "{{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}"
+      image: "{{ include.image | default: site.installation.container }}:{{ include.tag | default: 'stable' }}"
       volumes:
         - /PATH_TO_YOUR_CONFIG:/config
         - /etc/localtime:/etc/localtime:ro

diff --git a/source/_integrations/dsmr.markdown b/source/_integrations/dsmr.markdown
@@ -74,7 +74,7 @@ Connection can be done directly to the meter via a USB to serial connector, or t
 Docker users have to allow Docker access to the USB to serial converter by adding `--device /dev/ttyUSB21:/dev/ttyUSB21` to the run command:
 
 ```hass
-$ docker run --device /dev/ttyUSB0:/dev/ttyUSB0 -d --name="home-assistant" -v /home/USERNAME/hass:/config -v /etc/localtime:/etc/localtime:ro --net=host {{ site.installation.container.base }}
+$ docker run --device /dev/ttyUSB0:/dev/ttyUSB0 -d --name="home-assistant" -v /home/USERNAME/hass:/config -v /etc/localtime:/etc/localtime:ro --net=host {{ site.installation.container }}
 ```
 
 #### Serial to network proxies:

diff --git a/source/more-info/local-media/setup-media.markdown b/source/more-info/local-media/setup-media.markdown
@@ -26,7 +26,7 @@ docker run -d --name="home-assistant" \
   -v /PATH_TO_YOUR_CONFIG:/config \
   -v /etc/localtime:/etc/localtime:ro \
   --net=host \
-  {{ site.installation.container.base }}:stable
+  {{ site.installation.container }}:stable
 ```
 
 You'll need to change it to this:
@@ -37,7 +37,7 @@ docker run -d --name="home-assistant" \
   -v /PATH_TO_YOUR_MEDIA:/media \
   -v /etc/localtime:/etc/localtime:ro \
   --net=host \
-  {{ site.installation.container.base }}:stable
+  {{ site.installation.container }}:stable
 ```
 
 If you are using Docker compose, you can add a volume to your composition file