Compare commits

...

24 Commits

Author SHA1 Message Date
Alexandre
a6f49f298f Merge pull request #2282 from alexbelgium/codex/add-changelog-and-version-information
Add history recording storage extension configuration
2025-12-18 21:34:55 +01:00
Alexandre
0b3f4b7b38 Add history recording storage support 2025-12-18 21:34:38 +01:00
Alexandre
37bc46d5be Update 99-run.sh 2025-12-18 15:51:42 +01:00
Alexandre
124134ad1e nobuild 2025-12-18 15:31:45 +01:00
github-actions
3e026a99bc GitHub bot: changelog 2025-12-18 14:23:23 +00:00
Alexandre
28056af8da Update version to 25.10.1-2 in config.yaml 2025-12-18 15:21:26 +01:00
Alexandre
d09f4f15b7 Fix shebang path in 32-ingress.sh 2025-12-18 15:21:02 +01:00
Alexandre
98f7e6a535 Update 32-ingress.sh 2025-12-18 15:20:34 +01:00
Alexandre
0d3d7ce37d Update Dockerfile 2025-12-18 15:19:50 +01:00
GitHub Actions
50563cf1a8 Revert 'Update version to 25.10.1-2' [nobuild] 2025-12-18 14:12:46 +00:00
Alexandre
4cca9d6a77 Update version to 25.10.1-2 2025-12-18 15:10:44 +01:00
Alexandre
dd1a9ce21d Update shebang to use new bashio path 2025-12-18 15:10:17 +01:00
Alexandre
ea54e5f706 Comment out bashio installation in Dockerfile
Comment out bashio installation steps in Dockerfile
2025-12-18 15:09:51 +01:00
GitHub Actions
7315336e2b Revert 'Update version in config.yaml to 25.10.1-2' [nobuild] 2025-12-18 14:08:03 +00:00
Alexandre
ae01c1063a Update version in config.yaml to 25.10.1-2 2025-12-18 15:06:24 +01:00
Alexandre
f510d6695b Change ownership in Dockerfile COPY command 2025-12-18 15:03:31 +01:00
Alexandre
aafbc88a38 Update Dockerfile to set ownership on rootfs copy
Change ownership of copied files to user with ID 212.
2025-12-18 15:03:02 +01:00
GitHub Actions
7529a307fd Revert 'Update version to 25.11.29' [nobuild] 2025-12-18 13:57:45 +00:00
Alexandre
a1e6d3a896 Update version to 25.11.29 2025-12-18 14:55:27 +01:00
Alexandre
673cbea714 Fix Dockerfile syntax for bashio installation 2025-12-18 14:54:47 +01:00
Alexandre
542c0468c8 Refactor Dockerfile by cleaning up commands
Removed unnecessary chmod command and commented out bashio installation.
2025-12-18 14:54:31 +01:00
GitHub Actions
de50234e22 Revert 'Update version to 25.11.29' [nobuild] 2025-12-18 13:52:46 +00:00
Alexandre
cd79546d0e Update version to 25.11.29 2025-12-18 14:51:01 +01:00
Alexandre
2e61a55a52 Refactor Dockerfile to simplify permissions setup
Removed unnecessary ownership change and adjusted permissions for specific scripts.
2025-12-18 14:50:20 +01:00
8 changed files with 45 additions and 17 deletions

View File

@@ -1,5 +1,8 @@
- Added support for configuring extra environment variables via the `env_vars` add-on option alongside config.yaml. See https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon-2 for details.
## 1.6.0-12 (02-10-2025)
- Added configuration to enable the history recording storage extension with a configurable recording path
## 1.6.0-11 (16-09-2025)
- Minor bugs fixed
## 1.6.0-10 (16-09-2025)

View File

@@ -45,13 +45,15 @@ The default username is `guacadmin` with password `guacadmin`. It is strongly re
| Option | Type | Default | Description |
|--------|------|---------|-------------|
| `EXTENSIONS` | str | `auth-totp` | Guacamole extensions to enable (e.g., `auth-totp`) |
| `EXTENSIONS` | str | `auth-totp` | Guacamole extensions to enable (e.g., `auth-totp`, `history-recording-storage`) |
| `recording_search_path` | str | `/config/recordings` | Directory added to `guacamole.properties` as the `recording-search-path` used by the history recording storage extension |
| `TZ` | str | | Timezone (e.g., `Europe/London`) |
### Example Configuration
```yaml
EXTENSIONS: "auth-totp"
EXTENSIONS: "auth-totp,history-recording-storage"
recording_search_path: "/config/recordings"
TZ: "Europe/London"
```

View File

@@ -85,6 +85,7 @@ name: Guacamole Client
options:
env_vars: []
EXTENSIONS: auth-totp
recording_search_path: /config/recordings
panel_admin: false
panel_icon: mdi:lan
ports:
@@ -96,9 +97,10 @@ schema:
- name: match(^[A-Za-z0-9_]+$)
value: str?
EXTENSIONS: str?
recording_search_path: str?
TZ: str?
slug: guacamole
udev: true
url: https://github.com/alexbelgium/hassio-addons
version: 1.6.0-11
version: 1.6.0-12
video: true

View File

@@ -0,0 +1,24 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
set -e
readonly GUAC_PROPERTIES_FILE="/config/guacamole.properties"
recording_path="$(bashio::config 'recording_search_path')"
if bashio::var.is_empty "${recording_path}"; then
recording_path="/config/recordings"
fi
bashio::log.info "Ensuring recording storage path exists: ${recording_path}"
mkdir -p "${recording_path}"
if [ ! -f "${GUAC_PROPERTIES_FILE}" ]; then
bashio::log.info "Creating guacamole.properties at ${GUAC_PROPERTIES_FILE}"
touch "${GUAC_PROPERTIES_FILE}"
fi
if grep -q "^recording-search-path:" "${GUAC_PROPERTIES_FILE}"; then
sed -i "s|^recording-search-path:.*|recording-search-path: ${recording_path}|" "${GUAC_PROPERTIES_FILE}"
else
echo "recording-search-path: ${recording_path}" >> "${GUAC_PROPERTIES_FILE}"
fi

View File

@@ -1,3 +1,5 @@
## 25.10.1-2 (18-12-2025)
- Minor bugs fixed
## 25.10.1-4 (01-12-2025)
- Minor bugs fixed
## 25.10.1-3 (29-11-2025)

View File

@@ -30,20 +30,13 @@ ENV READ_WRITE_FOLDERS="$READ_WRITE_FOLDERS $NETALERTX_DATA"
##################
# Add rootfs
COPY rootfs/ /
RUN chown 102:102 /etc/cont-init.d/* && \
chmod +x /etc/cont-init.d/* && \
\
# Install bashio
BASHIO_VERSION="0.14.3" && \
COPY --chown=102:102 rootfs/ /
RUN BASHIO_VERSION="0.14.3" && \
mkdir -p /tmp/bashio && \
curl -f -L -s -S "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar -xzf - --strip 1 -C /tmp/bashio && \
mv /tmp/bashio/lib /usr/lib/bashio && \
ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
rm -rf /tmp/bashio && \
\
# Install packages
apk add jq
curl -f -L -s -S "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar -xzf - --strip 1 -C /tmp/bashio
#mv /tmp/bashio/lib /usr/lib/bashio && \
#ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
#rm -rf /tmp/
############
# 5 Labels #

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/usr/bin/with-contenv /tmp/bashio/lib/bashio
# shellcheck shell=bash
set -e

View File

@@ -99,3 +99,5 @@ else
wait_for_config_file &
true
fi
sudo -u "#${PUID}" -g "#${PGID}" /bin/sh /entrypoint.sh