From fd3b7cde3cf7b06411b7cfa0282cfea56a9b1d01 Mon Sep 17 00:00:00 2001 From: jwierzbo Date: Wed, 22 May 2024 12:08:08 +0200 Subject: [PATCH 1/2] BTS-1863 Update starter doc for the latest Docker changes --- .gitignore | 1 + .../3.10/deploy/active-failover/using-the-arangodb-starter.md | 3 ++- .../deploy/cluster/deployment/using-the-arangodb-starter.md | 3 ++- .../3.10/deploy/single-instance/using-the-arangodb-starter.md | 3 ++- .../3.11/deploy/active-failover/using-the-arangodb-starter.md | 3 ++- .../deploy/cluster/deployment/using-the-arangodb-starter.md | 3 ++- .../3.11/deploy/single-instance/using-the-arangodb-starter.md | 3 ++- .../deploy/cluster/deployment/using-the-arangodb-starter.md | 3 ++- .../3.12/deploy/single-instance/using-the-arangodb-starter.md | 3 ++- .../deploy/cluster/deployment/using-the-arangodb-starter.md | 3 ++- .../3.13/deploy/single-instance/using-the-arangodb-starter.md | 3 ++- 11 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a81c581bb2..7c279b747a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store .vscode/ +.idea/ /tmp/ node_modules/ *.pyc diff --git a/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md b/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md index 45af7d90ba..a6aa40d6f0 100644 --- a/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md +++ b/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md @@ -80,7 +80,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ --agents.agency.supervision-grace-period=30 \ --starter.address=$IP \ --starter.mode=activefailover \ - --starter.join=A,B,C + --starter.join=A,B,C \ + --docker.net-mode=default ``` Run the above command on machine A, B & C. diff --git a/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md index fb7ed2f351..496c0bc888 100644 --- a/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -156,7 +156,8 @@ docker run -it --name=adb1 --rm -p 8528:8528 \ -v arangodb1:/data \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` If you are running on Linux, it is also possible to use a host-mapped volume diff --git a/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md index c7c8c85530..cd04d13524 100644 --- a/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md @@ -45,7 +45,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key diff --git a/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md b/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md index 45af7d90ba..a6aa40d6f0 100644 --- a/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md +++ b/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md @@ -80,7 +80,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ --agents.agency.supervision-grace-period=30 \ --starter.address=$IP \ --starter.mode=activefailover \ - --starter.join=A,B,C + --starter.join=A,B,C \ + --docker.net-mode=default ``` Run the above command on machine A, B & C. diff --git a/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md index fb7ed2f351..496c0bc888 100644 --- a/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -156,7 +156,8 @@ docker run -it --name=adb1 --rm -p 8528:8528 \ -v arangodb1:/data \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` If you are running on Linux, it is also possible to use a host-mapped volume diff --git a/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md index c7c8c85530..cd04d13524 100644 --- a/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md @@ -45,7 +45,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key diff --git a/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md index fb7ed2f351..496c0bc888 100644 --- a/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -156,7 +156,8 @@ docker run -it --name=adb1 --rm -p 8528:8528 \ -v arangodb1:/data \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` If you are running on Linux, it is also possible to use a host-mapped volume diff --git a/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md index c7c8c85530..cd04d13524 100644 --- a/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md @@ -45,7 +45,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key diff --git a/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md index fb7ed2f351..496c0bc888 100644 --- a/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -156,7 +156,8 @@ docker run -it --name=adb1 --rm -p 8528:8528 \ -v arangodb1:/data \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` If you are running on Linux, it is also possible to use a host-mapped volume diff --git a/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md index c7c8c85530..cd04d13524 100644 --- a/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md @@ -45,7 +45,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key From 214bdce472cfe7b5786cf9e210ea37098bba4185 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Thu, 23 May 2024 12:01:13 +0200 Subject: [PATCH 2/2] Latest Docker (v26?) uses --net=bridge instead of default which the Starter can't (yet) deal with --- .../deploy/active-failover/using-the-arangodb-starter.md | 6 ++++-- .../cluster/deployment/using-the-arangodb-starter.md | 9 ++++++--- .../deploy/single-instance/using-the-arangodb-starter.md | 6 ++++-- .../deploy/active-failover/using-the-arangodb-starter.md | 6 ++++-- .../cluster/deployment/using-the-arangodb-starter.md | 9 ++++++--- .../deploy/single-instance/using-the-arangodb-starter.md | 6 ++++-- .../cluster/deployment/using-the-arangodb-starter.md | 9 ++++++--- .../deploy/single-instance/using-the-arangodb-starter.md | 6 ++++-- .../cluster/deployment/using-the-arangodb-starter.md | 9 ++++++--- .../deploy/single-instance/using-the-arangodb-starter.md | 6 ++++-- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md b/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md index a6aa40d6f0..b6b39ae70f 100644 --- a/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md +++ b/site/content/3.10/deploy/active-failover/using-the-arangodb-starter.md @@ -131,7 +131,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ --agents.agency.supervision-grace-period=30 \ --starter.address=$IP \ --starter.mode=activefailover \ - --starter.join=A,B,C + --starter.join=A,B,C \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -152,5 +153,6 @@ docker run -it --name=adb --rm -p 8528:8528 \ --agents.agency.supervision-grace-period=30 \ --starter.address=$IP \ --starter.mode=activefailover \ - --starter.join=A,B,C + --starter.join=A,B,C \ + --docker.net-mode=default ``` diff --git a/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md index 496c0bc888..6439552c82 100644 --- a/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.10/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -175,7 +175,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.join A + --starter.join A \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key @@ -211,7 +212,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ -e DOCKER_CERT_PATH=$DOCKER_CERT_PATH \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -229,7 +231,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /path/to/cert:/root/.docker \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` ## Under the Hood diff --git a/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md index cd04d13524..b4057671af 100644 --- a/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.10/deploy/single-instance/using-the-arangodb-starter.md @@ -83,7 +83,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /path/to/certificate:/path/to/certificate arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -102,5 +103,6 @@ docker run -it --name=adb --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` diff --git a/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md b/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md index a6aa40d6f0..b6b39ae70f 100644 --- a/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md +++ b/site/content/3.11/deploy/active-failover/using-the-arangodb-starter.md @@ -131,7 +131,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ --agents.agency.supervision-grace-period=30 \ --starter.address=$IP \ --starter.mode=activefailover \ - --starter.join=A,B,C + --starter.join=A,B,C \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -152,5 +153,6 @@ docker run -it --name=adb --rm -p 8528:8528 \ --agents.agency.supervision-grace-period=30 \ --starter.address=$IP \ --starter.mode=activefailover \ - --starter.join=A,B,C + --starter.join=A,B,C \ + --docker.net-mode=default ``` diff --git a/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md index 496c0bc888..6439552c82 100644 --- a/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.11/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -175,7 +175,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.join A + --starter.join A \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key @@ -211,7 +212,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ -e DOCKER_CERT_PATH=$DOCKER_CERT_PATH \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -229,7 +231,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /path/to/cert:/root/.docker \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` ## Under the Hood diff --git a/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md index cd04d13524..b4057671af 100644 --- a/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.11/deploy/single-instance/using-the-arangodb-starter.md @@ -83,7 +83,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /path/to/certificate:/path/to/certificate arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -102,5 +103,6 @@ docker run -it --name=adb --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` diff --git a/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md index 496c0bc888..6439552c82 100644 --- a/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.12/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -175,7 +175,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.join A + --starter.join A \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key @@ -211,7 +212,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ -e DOCKER_CERT_PATH=$DOCKER_CERT_PATH \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -229,7 +231,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /path/to/cert:/root/.docker \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` ## Under the Hood diff --git a/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md index cd04d13524..b4057671af 100644 --- a/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.12/deploy/single-instance/using-the-arangodb-starter.md @@ -83,7 +83,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /path/to/certificate:/path/to/certificate arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -102,5 +103,6 @@ docker run -it --name=adb --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` diff --git a/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md b/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md index 496c0bc888..6439552c82 100644 --- a/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md +++ b/site/content/3.13/deploy/cluster/deployment/using-the-arangodb-starter.md @@ -175,7 +175,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /var/run/docker.sock:/var/run/docker.sock \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.join A + --starter.join A \ + --docker.net-mode=default ``` If you use the Enterprise Edition Docker image, you have to set the license key @@ -211,7 +212,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ -e DOCKER_CERT_PATH=$DOCKER_CERT_PATH \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -229,7 +231,8 @@ docker run -it --name=adbN --rm -p 8528:8528 \ -v /path/to/cert:/root/.docker \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ - --starter.address=$IP + --starter.address=$IP \ + --docker.net-mode=default ``` ## Under the Hood diff --git a/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md b/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md index cd04d13524..b4057671af 100644 --- a/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md +++ b/site/content/3.13/deploy/single-instance/using-the-arangodb-starter.md @@ -83,7 +83,8 @@ docker run -it --name=adb --rm -p 8528:8528 \ -v /path/to/certificate:/path/to/certificate arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ``` Note that the environment variables `DOCKER_TLS_VERIFY` and `DOCKER_CERT_PATH` @@ -102,5 +103,6 @@ docker run -it --name=adb --rm -p 8528:8528 \ -e DOCKER_TLS_VERIFY=1 \ arangodb/arangodb-starter \ --starter.address=$IP \ - --starter.mode=single + --starter.mode=single \ + --docker.net-mode=default ```