Skip to content

Commit bb1e3ab

Browse files
authored
Merge pull request #137 from linuxserver/3.22
Rebase to alpine 3.22, rely on baseimage service for usb device permission fixing
2 parents 5133ae5 + d232c4b commit bb1e3ab

12 files changed

Lines changed: 8 additions & 42 deletions

File tree

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.21
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.22
44

55
# set version label
66
ARG BUILD_DATE
@@ -13,7 +13,8 @@ ENV \
1313
S6_SERVICES_GRACETIME=240000 \
1414
UV_SYSTEM_PYTHON=true \
1515
UV_NO_CACHE=true \
16-
UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/"
16+
UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/" \
17+
ATTACHED_DEVICES_PERMS="/dev/ttyACM* /dev/ttyUSB* -type c"
1718

1819
COPY root/etc/pip.conf /etc/
1920

Dockerfile.aarch64

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22
44

55
# set version label
66
ARG BUILD_DATE
@@ -13,7 +13,8 @@ ENV \
1313
S6_SERVICES_GRACETIME=240000 \
1414
UV_SYSTEM_PYTHON=true \
1515
UV_NO_CACHE=true \
16-
UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/"
16+
UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/" \
17+
ATTACHED_DEVICES_PERMS="/dev/ttyACM* /dev/ttyUSB* -type c"
1718

1819
COPY root/etc/pip.conf /etc/
1920

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
318318

319319
## Versions
320320

321+
* **02.10.25:** - Rebase to alpine 3.22, rely on baseimage service for usb device permission fixing.
321322
* **19.09.25:** - Add the necessary capabilities in the container to allow the unprivileged user access to bluetooth stack.
322323
* **03.01.25:** - Rebase to alpine 3.21.
323324
* **04.12.24:** - Make setcap target dynamic.

jenkins-vars.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ external_type: pip_version
66
release_type: stable
77
release_tag: latest
88
ls_branch: main
9-
build_armhf: false
109
repo_vars:
1110
- EXT_RELEASE_TYPE = 'pip_version'
1211
- EXT_PIP = 'homeassistant'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ init_diagram: |
116116
"homeassistant:latest" <- Base Images
117117
# changelog
118118
changelogs:
119+
- {date: "02.10.25:", desc: "Rebase to alpine 3.22, rely on baseimage service for usb device permission fixing."}
119120
- {date: "19.09.25:", desc: "Add the necessary capabilities in the container to allow the unprivileged user access to bluetooth stack."}
120121
- {date: "03.01.25:", desc: "Rebase to alpine 3.21."}
121122
- {date: "04.12.24:", desc: "Make setcap target dynamic."}

root/etc/s6-overlay/s6-rc.d/init-usb-homeassistant/dependencies.d/init-config-homeassistant renamed to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-config-homeassistant

File renamed without changes.

root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-usb-homeassistant

Whitespace-only changes.

root/etc/s6-overlay/s6-rc.d/init-usb-homeassistant/run

Lines changed: 0 additions & 35 deletions
This file was deleted.

root/etc/s6-overlay/s6-rc.d/init-usb-homeassistant/type

Lines changed: 0 additions & 1 deletion
This file was deleted.

root/etc/s6-overlay/s6-rc.d/init-usb-homeassistant/up

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)