mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-02-16 18:50:20 +00:00
Compare commits
6 commits
bb0640d2ac
...
a5f88d4b77
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5f88d4b77 | ||
|
|
a9d462489c | ||
|
|
1617254c2f | ||
|
|
f1a6526a4b | ||
|
|
238117ac47 | ||
|
|
57efcd852d |
4 changed files with 5 additions and 5 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
FROM caddy:2.10.2-alpine AS caddy
|
FROM caddy:2.10.2-alpine AS caddy
|
||||||
|
|
||||||
# From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile
|
# 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
|
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -116,14 +116,14 @@ fi
|
||||||
|
|
||||||
# Docker api version check
|
# Docker api version check
|
||||||
# shellcheck disable=SC2001
|
# 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/\.//')"
|
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
|
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/\.//')"
|
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
|
fi
|
||||||
if [ -n "$LOCAL_API_VERSION_NUMB" ] && [ -n "$API_VERSION_NUMB" ]; then
|
if [ -n "$LOCAL_API_VERSION_NUMB" ] && [ -n "$API_VERSION_NUMB" ]; then
|
||||||
if ! [ "$LOCAL_API_VERSION_NUMB" -ge "$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 "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 "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"
|
echo "See https://github.com/nextcloud/all-in-one#how-to-adjust-the-internally-used-docker-api-version"
|
||||||
|
|
|
||||||
|
|
@ -438,7 +438,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- TZ=${TIMEZONE}
|
- TZ=${TIMEZONE}
|
||||||
- ES_JAVA_OPTS=${FULLTEXTSEARCH_JAVA_OPTIONS}
|
- ES_JAVA_OPTS=${FULLTEXTSEARCH_JAVA_OPTIONS}
|
||||||
- bootstrap.memory_lock=true
|
- bootstrap.memory_lock=false
|
||||||
- cluster.name=nextcloud-aio
|
- cluster.name=nextcloud-aio
|
||||||
- discovery.type=single-node
|
- discovery.type=single-node
|
||||||
- logger.level=WARN
|
- logger.level=WARN
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<main>
|
<main>
|
||||||
<h1>Nextcloud AIO v12.2.0</h1>
|
<h1>Nextcloud AIO v12.2.1</h1>
|
||||||
|
|
||||||
{# Add 2nd tab warning #}
|
{# Add 2nd tab warning #}
|
||||||
<script type="text/javascript" src="second-tab-warning.js"></script>
|
<script type="text/javascript" src="second-tab-warning.js"></script>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue