eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

add docs for macOS and improve docker testing

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-03-17 10:51:34 +01:00
parent 68ac85e60b
commit 7bcd0c16c0
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Containers/mastercontainer/start.sh
View file

@ -43,7 +43,7 @@ elif ! sudo -u www-data test -r /var/run/docker.sock; then
fi fi
# Check if api version is supported # Check if api version is supported
if ! docker info &>/dev/null; then if ! sudo -u www-data docker info &>/dev/null; then
echo "Cannot connect to the docker socket. Cannot proceed." echo "Cannot connect to the docker socket. Cannot proceed."
exit 1 exit 1
fi fi
@ -51,7 +51,7 @@ API_VERSION_FILE="$(find ./ -name DockerActionManager.php | head -1)"
API_VERSION="$(grep -oP 'const API_VERSION.*\;' "$API_VERSION_FILE" | grep -oP '[0-9]+.[0-9]+' | head -1)" API_VERSION="$(grep -oP 'const API_VERSION.*\;' "$API_VERSION_FILE" | grep -oP '[0-9]+.[0-9]+' | head -1)"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
API_VERSION_NUMB="$(echo "$API_VERSION" | sed 's/\.//')" API_VERSION_NUMB="$(echo "$API_VERSION" | sed 's/\.//')"
LOCAL_API_VERSION_NUMB="$(docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')" LOCAL_API_VERSION_NUMB="$(sudo -u www-data docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"
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
echo "Docker v$API_VERSION is not supported by your docker engine. Cannot proceed." echo "Docker v$API_VERSION is not supported by your docker engine. Cannot proceed."
@ -63,10 +63,10 @@ else
fi fi
# Check if startup command was executed correctly # Check if startup command was executed correctly
if ! docker ps | grep -q "nextcloud-aio-mastercontainer"; then if ! sudo -u www-data docker ps | grep -q "nextcloud-aio-mastercontainer"; then
echo "It seems like you did not give the mastercontainer the correct name?" echo "It seems like you did not give the mastercontainer the correct name?"
exit 1 exit 1
elif ! docker volume ls | grep -q "nextcloud_aio_mastercontainer"; then elif ! sudo -u www-data docker volume ls | grep -q "nextcloud_aio_mastercontainer"; then
echo "It seems like you did not give the mastercontainer volume the correct name?" echo "It seems like you did not give the mastercontainer volume the correct name?"
exit 1 exit 1
fi fi

3
readme.md
View file

@ -78,6 +78,9 @@ Nextcloud AIO is inspired by projects like Portainer that allow to manage the do
### Are reverse proxies supported? ### Are reverse proxies supported?
Yes. Please refer to the following documentation on this: [reverse-proxy.md](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md) Yes. Please refer to the following documentation on this: [reverse-proxy.md](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md)
### How to run it on macOS?
On macOS, there is one specialty in comparison to linux: instead of using `--volume /var/run/docker.sock:/var/run/docker.sock:ro`, you need to use `--volume /var/run/docker.sock.raw:/var/run/docker.sock:ro`. Apart from that it should work and behave the same like on linux.
### Which ports are mandatory to be open? ### Which ports are mandatory to be open?
Only those (if you acces the Mastercontainer Interface internally via port 8080): Only those (if you acces the Mastercontainer Interface internally via port 8080):
- `443/TCP` for the Apache container - `443/TCP` for the Apache container