Skip to content

Commit

Permalink
configurator: Alpine 3.18, upgrade mapping, tweaks (home-assistant#3300)
Browse files Browse the repository at this point in the history
  • Loading branch information
frenck authored Nov 15, 2023
1 parent 992e03e commit 460bedb
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 13 deletions.
1 change: 1 addition & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ignored:
- DL3008
- DL3013
- DL3018
- DL3042
- DL4006
- SC2046
- SC2086
8 changes: 8 additions & 0 deletions configurator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 5.7.0

- Use new location for accessing the Home Assistant configuration folder using `/homeassistant`
- Add access to the new public configuration folders of add-ons
- Upgrade to Alpine 3.18
- Remove unneeded pip configuration when building add-on
- Remove unused variable in finish script

## 5.6.0

- Update base image to Alpine 3.17
Expand Down
3 changes: 2 additions & 1 deletion configurator/DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ Set it to `true` to list directories first, `false` otherwise.

### Option: `enforce_basepath` (required)

If set to `true`, access is limited to files within the `/config` directory.
If set to `true`, access is limited to files within the `/homeassistant` directory
(also known as the `/config` folder inside Home Assisant itself).

### Option: `git` (required)

Expand Down
3 changes: 0 additions & 3 deletions configurator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ RUN \
py3-pip \
python3 \
&& pip3 install \
--no-cache-dir \
--prefer-binary \
--find-links "https://wheels.home-assistant.io/musllinux/${BUILD_ARCH}/" \
hass-configurator=="${CONFIGURATOR_VERSION}" \
\
&& find /usr/local \
Expand Down
10 changes: 5 additions & 5 deletions configurator/build.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base:3.17
amd64: ghcr.io/home-assistant/amd64-base:3.17
armhf: ghcr.io/home-assistant/armhf-base:3.17
armv7: ghcr.io/home-assistant/armv7-base:3.17
i386: ghcr.io/home-assistant/i386-base:3.17
aarch64: ghcr.io/home-assistant/aarch64-base:3.18
amd64: ghcr.io/home-assistant/amd64-base:3.18
armhf: ghcr.io/home-assistant/armhf-base:3.18
armv7: ghcr.io/home-assistant/armv7-base:3.18
i386: ghcr.io/home-assistant/i386-base:3.18
codenotary:
signer: [email protected]
base_image: [email protected]
Expand Down
5 changes: 3 additions & 2 deletions configurator/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 5.6.0
version: 5.7.0
slug: configurator
name: File editor
description: Simple browser-based file editor for Home Assistant
Expand All @@ -17,8 +17,9 @@ image: homeassistant/{arch}-addon-configurator
ingress: true
init: false
map:
- all_addon_configs:rw
- backup:rw
- config:rw
- homeassistant_config:rw
- media:rw
- share:rw
- ssl:rw
Expand Down
2 changes: 1 addition & 1 deletion configurator/rootfs/etc/configurator.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"LISTENIP": "0.0.0.0",
"PORT": 8099,
"GIT": true,
"BASEPATH": "/config",
"BASEPATH": "/homeassistant",
"ENFORCE_BASEPATH": true,
"SSL_CERTIFICATE": null,
"SSL_KEY": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Take down the S6 supervision tree when service fails
# s6-overlay docs: https://github.com/just-containers/s6-overlay
# ==============================================================================
declare exit_code
readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
readonly exit_code_service="${1}"
readonly exit_code_signal="${2}"
Expand Down

0 comments on commit 460bedb

Please sign in to comment.