Use ghcr where possible (#18274)

This commit is contained in:
Joakim Sørensen 2021-06-22 17:26:39 +02:00 committed by GitHub
parent 6b3e7ef36b
commit 6699c0d49f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 24 additions and 20 deletions

View File

@ -175,6 +175,10 @@ toc:
# Configuration for installation pages # Configuration for installation pages
installation: installation:
container:
base: "ghcr.io/home-assistant/home-assistant"
raspberrypi3: "ghcr.io/home-assistant/raspberrypi3-homeassistant"
raspberrypi4: "ghcr.io/home-assistant/raspberrypi4-homeassistant"
versions: versions:
python: "3.8" python: "3.8"
types: types:

View File

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

View File

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

View File

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

View File

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

View File

@ -17,17 +17,17 @@ Installation with Docker is straightforward. Adjust the following command so tha
{% if page.installation_type == 'raspberrypi' %} {% if page.installation_type == 'raspberrypi' %}
#### Raspberry pi 3 #### Raspberry pi 3
{% include installation/container/cli.md image="homeassistant/raspberrypi3-homeassistant:stable" %} {% include installation/container/cli.md image=site.installation.container.raspberrypi3 %}
#### Raspberry pi 4 #### Raspberry pi 4
{% include installation/container/cli.md image="homeassistant/raspberrypi4-homeassistant:stable" %} {% include installation/container/cli.md image=site.installation.container.raspberrypi4 %}
{% elsif page.installation_type == 'alternative' %} {% elsif page.installation_type == 'alternative' %}
{% include installation/container/alternative.md %} {% include installation/container/alternative.md %}
{% else %} {% else %}
{% include installation/container/cli.md image="homeassistant/home-assistant:stable" %} {% include installation/container/cli.md %}
{% endif %} {% endif %}
Once the Home Assistant Container is running Home Assistant should be accessible using `http://<host>:8123` (replace <host> with the hostname or IP of the system). You can continue with onboarding. Once the Home Assistant Container is running Home Assistant should be accessible using `http://<host>:8123` (replace <host> with the hostname or IP of the system). You can continue with onboarding.
@ -67,13 +67,13 @@ As the Docker command becomes more complex, switching to `docker-compose` can be
{% if page.installation_type == 'raspberrypi' %} {% if page.installation_type == 'raspberrypi' %}
#### Raspberry pi 3 #### Raspberry pi 3
{% include installation/container/compose.md image="homeassistant/raspberrypi3-homeassistant:stable" %} {% include installation/container/compose.md image=site.installation.container.raspberrypi3 %}
#### Raspberry pi 4 #### Raspberry pi 4
{% include installation/container/compose.md image="homeassistant/raspberrypi4-homeassistant:stable" %} {% include installation/container/compose.md image=site.installation.container.raspberrypi4 %}
{% else %} {% else %}
{% include installation/container/compose.md image="homeassistant/home-assistant:stable" %} {% include installation/container/compose.md %}
{% endif %} {% endif %}
Start it by running: Start it by running:

View File

@ -42,7 +42,7 @@ Adjust the following Terminal command as follows :
Run it in Terminal. Run it in Terminal.
```bash ```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 homeassistant/home-assistant: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.base }}:stable
``` ```
Complete the remainder of the Z-Wave configuration by [following the instructions here.](/docs/z-wave/installation) Complete the remainder of the Z-Wave configuration by [following the instructions here.](/docs/z-wave/installation)
@ -104,7 +104,7 @@ If you want to use a USB Bluetooth adapter or Z-Wave USB stick with Home Assista
- Run Docker command: - Run Docker command:
```bash ```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 homeassistant/home-assistant: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.base }}:stable
``` ```
`-v` is your configuration path `-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: - Run Docker command:
```bash ```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 homeassistant/home-assistant: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.base }}:stable
``` ```
First `-v` is your configuration path First `-v` is your configuration path

View File

@ -10,7 +10,7 @@
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-v /PATH_TO_YOUR_CONFIG:/config \ -v /PATH_TO_YOUR_CONFIG:/config \
--network=host \ --network=host \
{{ include.image }} {{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}
``` ```
- title: Update - title: Update
@ -39,7 +39,7 @@
-v /PATH_TO_YOUR_CONFIG:/config \ -v /PATH_TO_YOUR_CONFIG:/config \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--network=host \ --network=host \
{{ include.image }} {{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}
``` ```
{% endtabbed_block %} {% endtabbed_block %}

View File

@ -3,7 +3,7 @@
services: services:
homeassistant: homeassistant:
container_name: homeassistant container_name: homeassistant
image: {{ include.image }} image: "{{ include.image | default: site.installation.container.base }}:{{ include.tag | default: 'stable' }}"
volumes: volumes:
- /PATH_TO_YOUR_CONFIG:/config - /PATH_TO_YOUR_CONFIG:/config
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro

View File

@ -136,7 +136,7 @@ or
Docker users have to allow Docker access to the device by adding `--device /dev/ttyUSB21:/dev/ttyUSB21` to the run command: Docker users have to allow Docker access to the device by adding `--device /dev/ttyUSB21:/dev/ttyUSB21` to the run command:
```hass ```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 homeassistant/home-assistant $ 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 }}
``` ```
### Options ### Options

View File

@ -26,7 +26,7 @@ docker run -d --name="home-assistant" \
-v /PATH_TO_YOUR_CONFIG:/config \ -v /PATH_TO_YOUR_CONFIG:/config \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--net=host \ --net=host \
homeassistant/home-assistant:stable {{ site.installation.container.base }}:stable
``` ```
You'll need to change it to this: 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 /PATH_TO_YOUR_MEDIA:/media \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--net=host \ --net=host \
homeassistant/home-assistant:stable {{ site.installation.container.base }}:stable
``` ```
If you are using Docker compose, you can add a volume to your composition file If you are using Docker compose, you can add a volume to your composition file