Compare commits

...

6 commits

Author SHA1 Message Date
szaimen
a5f88d4b77 Yaml updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-12-08 12:04:06 +00:00
Simon L.
a9d462489c increase to 12.2.1
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-12-08 10:03:53 +01:00
Simon L.
1617254c2f
Merge pull request #7280 from nextcloud/enh/7223/skip-version-check
mastercontainer: fix docker api version check if DOCKER_API_VERSION was set globally
2025-12-08 09:55:09 +01:00
Simon L.
f1a6526a4b
Merge pull request #7275 from nextcloud/dependabot/docker/Containers/apache/httpd-2.4.66-alpine3.22
build(deps): bump httpd from 2.4.65-alpine3.22 to 2.4.66-alpine3.22 in /Containers/apache
2025-12-08 09:54:38 +01:00
Simon L.
238117ac47 mastercontainer: fix docker api version check if DOCKER_API_VERSION was set globally
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-12-08 09:51:33 +01:00
dependabot[bot]
57efcd852d
build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.65-alpine3.22 to 2.4.66-alpine3.22.

---
updated-dependencies:
- dependency-name: httpd
  dependency-version: 2.4.66-alpine3.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-05 04:12:33 +00:00
4 changed files with 5 additions and 5 deletions

View file

@ -2,7 +2,7 @@
FROM caddy:2.10.2-alpine AS caddy
# From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile
FROM httpd:2.4.65-alpine3.22
FROM httpd:2.4.66-alpine3.22
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy

View file

@ -116,14 +116,14 @@ fi
# Docker api version check
# shellcheck disable=SC2001
API_VERSION_NUMB="$(echo "$API_VERSION" | sed 's/\.//')"
API_VERSION_NUMB="$(echo "$DOCKER_API_VERSION" | sed 's/\.//')"
LOCAL_API_VERSION_NUMB="$(sudo -E -u www-data docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"
if [ -z "$LOCAL_API_VERSION_NUMB" ]; then
LOCAL_API_VERSION_NUMB="$(sudo -E -u www-data DOCKER_API_VERSION="$FALLBACK_DOCKER_API_VERSION" docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"
fi
if [ -n "$LOCAL_API_VERSION_NUMB" ] && [ -n "$API_VERSION_NUMB" ]; then
if ! [ "$LOCAL_API_VERSION_NUMB" -ge "$API_VERSION_NUMB" ]; then
print_red "Docker API v$API_VERSION is not supported by your docker engine. Cannot proceed. Please upgrade your docker engine if you want to run Nextcloud AIO!"
print_red "Docker API v$DOCKER_API_VERSION is not supported by your docker engine. Cannot proceed. Please upgrade your docker engine if you want to run Nextcloud AIO!"
echo "Alternatively, set the DOCKER_API_VERSION environmental variable to a compatible version."
echo "However please note that only v$API_VERSION is officially supported and tested by the maintainers of Nextcloud AIO."
echo "See https://github.com/nextcloud/all-in-one#how-to-adjust-the-internally-used-docker-api-version"

View file

@ -438,7 +438,7 @@ services:
environment:
- TZ=${TIMEZONE}
- ES_JAVA_OPTS=${FULLTEXTSEARCH_JAVA_OPTIONS}
- bootstrap.memory_lock=true
- bootstrap.memory_lock=false
- cluster.name=nextcloud-aio
- discovery.type=single-node
- logger.level=WARN

View file

@ -17,7 +17,7 @@
<div class="container">
<main>
<h1>Nextcloud AIO v12.2.0</h1>
<h1>Nextcloud AIO v12.2.1</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>