Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ssh/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 10.0.0

- Upgrade to Alpine 3.23
- Upgrade Home Assistant CLI to 4.46.0
- Use ttyd from Alpine package repository

## 9.22.0

- Upgrade Home Assistant CLI to 4.45.0
Expand Down
56 changes: 3 additions & 53 deletions ssh/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ ARG BUILD_FROM
FROM $BUILD_FROM

# Setup base
ARG LIBWEBSOCKETS_VERSION
ARG TTYD_VERSION
RUN \
set -x \
set -x \
&& apk add --no-cache \
bash-completion \
pulseaudio-utils \
Expand All @@ -18,56 +16,8 @@ RUN \
openssh \
pwgen \
tmux \
vim \
\
&& apk add --no-cache --virtual .build-dependencies \
bsd-compat-headers \
build-base \
linux-headers \
cmake \
json-c-dev \
libuv-dev \
openssl-dev \
zlib-dev \
\
&& sed -i "s|/bin/sh|/bin/bash|" /etc/passwd \
\
&& git clone --branch "v${LIBWEBSOCKETS_VERSION}" --depth=1 \
https://github.com/warmcat/libwebsockets.git /tmp/libwebsockets \
\
&& mkdir -p /tmp/libwebsockets/build \
&& cd /tmp/libwebsockets/build \
&& cmake .. \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DLWS_IPV6=ON \
-DLWS_STATIC_PIC=ON \
-DLWS_UNIX_SOCK=ON \
-DLWS_WITH_LIBUV=ON \
-DLWS_WITH_SHARED=ON \
-DLWS_WITHOUT_TESTAPPS=ON \
&& make \
&& make install \
\
&& git clone --branch main --single-branch \
https://github.com/tsl0922/ttyd.git /tmp/ttyd \
&& git -C /tmp/ttyd checkout "${TTYD_VERSION}" \
\
&& mkdir -p /tmp/ttyd/build \
&& cd /tmp/ttyd/build \
&& cmake .. \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
&& make \
&& make install \
\
&& apk del --no-cache --purge .build-dependencies \
&& rm -f -r \
/root/.cache \
/root/.cmake \
/tmp/*
ttyd \
vim

# Add YAML highlighting for nano
ADD https://raw.githubusercontent.com/scopatz/nanorc/master/yaml.nanorc /usr/share/nano/yaml.nanorc
Expand Down
8 changes: 3 additions & 5 deletions ssh/build.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base:3.22
amd64: ghcr.io/home-assistant/amd64-base:3.22
aarch64: ghcr.io/home-assistant/aarch64-base:3.23-2025.12.2
amd64: ghcr.io/home-assistant/amd64-base:3.23-2025.12.2
args:
CLI_VERSION: 4.45.0
LIBWEBSOCKETS_VERSION: 4.4.1
TTYD_VERSION: 1.7.7
CLI_VERSION: 4.46.0
2 changes: 1 addition & 1 deletion ssh/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 9.22.0
version: 10.0.0
slug: ssh
name: Terminal & SSH
description: Allow logging in remotely to Home Assistant using SSH
Expand Down
2 changes: 1 addition & 1 deletion ssh/rootfs/etc/services.d/sshd/finish
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# ==============================================================================

if [[ "$1" -ne 0 ]] && [[ "$1" -ne 256 ]]; then
bashio::log.warning "Halt add-on"
bashio::log.warning "Halt app"
exec /run/s6/basedir/bin/halt
fi

Expand Down
2 changes: 1 addition & 1 deletion ssh/rootfs/etc/services.d/ttyd/finish
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# ==============================================================================

if [[ "$1" -ne 0 ]] && [[ "$1" -ne 256 ]]; then
bashio::log.warning "Halt add-on"
bashio::log.warning "Halt app"
exec /run/s6/basedir/bin/halt
fi

Expand Down