From ab45f17aeed80a9e1a27cc88421a536466b3e326 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Tue, 4 Aug 2026 13:38:39 +0200 Subject: [PATCH] some additional changes Signed-off-by: Simon L. --- .github/dependabot.yml | 1 + Containers/harp/Dockerfile | 17 +++++++++++++++++ manual-install/update-yaml.sh | 1 + nextcloud-aio-helm-chart/update-helm.sh | 2 ++ php/containers.json | 12 ++++++++++-- 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Containers/harp/Dockerfile diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 44679462..f9026f28 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -33,6 +33,7 @@ updates: - "/Containers/domaincheck" - "/Containers/eurooffice" - "/Containers/fulltextsearch" + - "/Containers/harp" - "/Containers/imaginary" - "/Containers/mastercontainer" - "/Containers/nextcloud" diff --git a/Containers/harp/Dockerfile b/Containers/harp/Dockerfile new file mode 100644 index 00000000..0a931846 --- /dev/null +++ b/Containers/harp/Dockerfile @@ -0,0 +1,17 @@ +# syntax=docker/dockerfile:latest +FROM ghcr.io/nextcloud/nextcloud-appapi-harp:v0.4.3 + +# USER root is probably used + +LABEL com.centurylinklabs.watchtower.enable="false" \ + wud.watch="false" \ + dockhand.update="false" \ + org.opencontainers.image.title="Nextcloud AppAPI HARP for Nextcloud AIO" \ + org.opencontainers.image.description="Nextcloud AppAPI HARP for Nextcloud All-in-One" \ + org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \ + org.opencontainers.image.source="https://github.com/nextcloud/all-in-one" \ + org.opencontainers.image.vendor="Nextcloud" \ + org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md" + +# Copied from upstream +HEALTHCHECK --interval=10s --timeout=10s --retries=9 CMD /healthcheck.sh diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 3b1a5a9d..88e5b3ab 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -92,6 +92,7 @@ sed -i 's|NEXTCLOUD_TRUSTED_CACERTS_DIR=|NEXTCLOUD_TRUSTED_CACERTS_DIR=/usr/loca sed -i 's|UPDATE_NEXTCLOUD_APPS=|UPDATE_NEXTCLOUD_APPS="no" # When setting to "yes" (with quotes), it will automatically update all installed Nextcloud apps upon container startup on saturdays.|' sample.conf sed -i 's|APACHE_PORT=|APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else).|' sample.conf sed -i 's|APACHE_IP_BINDING=|APACHE_IP_BINDING=0.0.0.0 # This can be changed to e.g. 127.0.0.1 if you want to run AIO behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) and if that is running on the same host and using localhost to connect|' sample.conf +sed -i 's|WATCHTOWER_DOCKER_SOCKET_PATH=|WATCHTOWER_DOCKER_SOCKET_PATH=/var/run/docker.sock # This can be changed depending on where the docker socket is located on your host|' sample.conf sed -i 's|TALK_PORT=|TALK_PORT=3478 # This allows to adjust the port that the talk container is using. It should be set to something higher than 1024! Otherwise it might not work!|' sample.conf sed -i 's|NC_DOMAIN=|NC_DOMAIN=yourdomain.com # TODO! Needs to be changed to the domain that you want to use for Nextcloud.|' sample.conf sed -i 's|NEXTCLOUD_PASSWORD=|NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin".|' sample.conf diff --git a/nextcloud-aio-helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh index 06f7ba89..9e4d9a6a 100755 --- a/nextcloud-aio-helm-chart/update-helm.sh +++ b/nextcloud-aio-helm-chart/update-helm.sh @@ -44,6 +44,7 @@ sed -i "s|- \${TALK_PORT}|- $TALK_PORT|" latest.yml sed -i "s|\${NEXTCLOUD_DATADIR}|$NEXTCLOUD_DATADIR|" latest.yml sed -i "s|\${ADDITIONAL_COLLABORA_OPTIONS}|ADDITIONAL_COLLABORA_OPTIONS_PLACEHOLDER|" latest.yml sed -i "/name: nextcloud-aio/,$ d" latest.yml +sed -i "/WATCHTOWER_DOCKER_SOCKET_PATH/d" latest.yml sed -i "/NEXTCLOUD_DATADIR/d" latest.yml sed -i "/\${NEXTCLOUD_MOUNT}/d" latest.yml sed -i "/^volumes:/a\ \ nextcloud_aio_nextcloud_trusted_cacerts:\n \ \ \ \ name: nextcloud_aio_nextcloud_trusted_cacerts" latest.yml @@ -432,6 +433,7 @@ sed -i 's|= |: |' /tmp/sample.conf sed -i '/^NEXTCLOUD_DATADIR/d' /tmp/sample.conf sed -i '/^APACHE_IP_BINDING/d' /tmp/sample.conf sed -i '/^NEXTCLOUD_MOUNT/d' /tmp/sample.conf +sed -i "/WATCHTOWER_DOCKER_SOCKET_PATH/d" /tmp/sample.conf sed -i 's/ yes / "yes" /' /tmp/sample.conf sed -i 's/ no / "no" /' /tmp/sample.conf sed -i 's/"no" authentication/no authentication/' /tmp/sample.conf diff --git a/php/containers.json b/php/containers.json index d8900c45..8284777e 100644 --- a/php/containers.json +++ b/php/containers.json @@ -933,14 +933,22 @@ }, { "container_name": "nextcloud-aio-harp", - "image_tag": "release", + "image_tag": "%AIO_CHANNEL%", "display_name": "HaRP", - "image": "ghcr.io/nextcloud/nextcloud-appapi-harp", + "image": "ghcr.io/nextcloud-releases/aio-harp", "init": true, "internal_port": "8780", "expose": [ "8780" ], + "healthcheck": { + "start_period": "0s", + "test": "/healthcheck.sh", + "interval": "10s", + "timeout": "10s", + "start_interval": "5s", + "retries": 9 + }, "environment": [ "HP_SHARED_KEY=%HP_SHARED_KEY%", "NC_INSTANCE_URL=https://%NC_DOMAIN%",