Update docker compose scripts for docker compose v2

Update docker compose scripts for docker compose v2, as legacy docker-compose v1 is no longer supported for github actions.
chbhat10 · Aug 2, 2024 · 4f5c431 · 4f5c431
1 parent d41ba1c
commit 4f5c431
Show file tree

Hide file tree

Showing 44 changed files with 43 additions and 65 deletions.
diff --git a/presto-docs/src/main/sphinx/clients/superset.rst b/presto-docs/src/main/sphinx/clients/superset.rst
@@ -32,7 +32,7 @@ Follow these steps to configure Superset to query Presto.
    displayed, continue. 
 
    Note: If your Presto server is running locally, ``localhost`` may not resolve 
-   DNS successfully from the Superset docker-compose launched instance to the 
+   DNS successfully from the Superset docker compose launched instance to the
    local Presto server. Replace ``<Presto-IP-address>`` with your system's actual 
    IP address. 
 

diff --git a/presto-hive-hadoop2/bin/common.sh b/presto-hive-hadoop2/bin/common.sh
@@ -21,7 +21,7 @@ function retry() {
 }
 
 function hadoop_master_container(){
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" ps -q hadoop-master
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" ps -q hadoop-master
 }
 
 function hadoop_master_ip() {
@@ -54,7 +54,7 @@ function stop_unnecessary_hadoop_services() {
 
 function cleanup_docker_containers() {
   # stop containers started with "up"
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" down
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" down
 
   # docker logs processes are being terminated as soon as docker container are stopped
   # wait for docker logs termination
@@ -76,7 +76,7 @@ PROJECT_ROOT="${INTEGRATION_TESTS_ROOT}/.."
 DOCKER_COMPOSE_LOCATION="${INTEGRATION_TESTS_ROOT}/conf/docker-compose.yml"
 
 # check docker and docker compose installation
-docker-compose version
+docker compose version
 docker version
 
 # extract proxy IP
@@ -89,21 +89,21 @@ fi
 
 function start_docker_containers() {
   # stop already running containers
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" down || true
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" down || true
 
   # catch terminate signals
   trap termination_handler INT TERM
 
   # pull docker images
   if [[ "${CONTINUOUS_INTEGRATION:-false}" == 'true' ]]; then
-    docker-compose -f "${DOCKER_COMPOSE_LOCATION}" pull
+    docker compose -f "${DOCKER_COMPOSE_LOCATION}" pull
   fi
 
   # start containers
-  retry docker-compose -f "${DOCKER_COMPOSE_LOCATION}" up -d
+  retry docker compose -f "${DOCKER_COMPOSE_LOCATION}" up -d
 
   # start docker logs for hadoop container
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" logs --no-color hadoop-master &
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" logs --no-color hadoop-master &
 
   # wait until hadoop processes is started
   retry check_hadoop

diff --git a/presto-hive-hadoop2/conf/docker-compose.yml b/presto-hive-hadoop2/conf/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   hadoop-master:
     hostname: hadoop-master

diff --git a/presto-kudu/bin/run_kudu_tests.sh b/presto-kudu/bin/run_kudu_tests.sh
@@ -43,14 +43,14 @@ fi
 
 function start_docker_container() {
   # stop already running containers
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" down || true
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" down || true
 
   # start containers
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" up -d
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" up -d
 }
 
 function cleanup_docker_container() {
-  docker-compose -f "${DOCKER_COMPOSE_LOCATION}" down
+  docker compose -f "${DOCKER_COMPOSE_LOCATION}" down
 }
 
 

diff --git a/presto-kudu/conf/docker-compose-single-node.yaml b/presto-kudu/conf/docker-compose-single-node.yaml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   kudu:
     hostname: kudu

diff --git a/presto-kudu/conf/docker-compose-three-nodes.yaml b/presto-kudu/conf/docker-compose-three-nodes.yaml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   kudu1:
     hostname: kudu1

diff --git a/presto-native-execution/docker-compose.yml b/presto-native-execution/docker-compose.yml
@@ -9,12 +9,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-version: '3.5'
-
 services:
   ubuntu-native-dependency:
     # Usage:
-    #   docker-compose build ubuntu-native-dependency
+    #   docker compose build ubuntu-native-dependency
     #   podman compose build ubuntu-native-dependency
     image: presto/prestissimo-dependency:ubuntu-22.04
     build:
@@ -23,7 +21,7 @@ services:
 
   ubuntu-native-runtime:
     # Usage:
-    #   docker-compose build ubuntu-native-runtime
+    #   docker compose build ubuntu-native-runtime
     #   podman compose build ubuntu-native-runtime
     image: presto/prestissimo-runtime:ubuntu-22.04
     build:
@@ -42,7 +40,7 @@ services:
 
   centos-native-dependency:
     # Usage:
-    #   docker-compose build centos-native-dependency
+    #   docker compose build centos-native-dependency
     #   podman compose build centos-native-dependency
     image: presto/prestissimo-dependency:centos8
     build:
@@ -51,7 +49,7 @@ services:
 
   centos-native-runtime:
     # Usage:
-    #   docker-compose build centos-native-runtime
+    #   docker compose build centos-native-runtime
     #   podman compose build centos-native-runtime
     image: presto/prestissimo-runtime:centos8
     build:

diff --git a/presto-product-tests/README.md b/presto-product-tests/README.md
@@ -29,15 +29,15 @@ broken.
     wget -qO- https://get.docker.com/ | sh
     ```
 
-* [`docker-compose >= 1.8.1`](https://docs.docker.com/compose/install/)
+* [`docker compose >= 2.3.4`](https://docs.docker.com/compose/install/)
 
     ```
-    pip install docker-compose
+    sudo apt-get install docker-compose-plugin
     ```
 
 ### OS X using Docker for Mac
 
-* Install [Docker for Mac](https://docs.docker.com/docker-for-mac/)
+* Install [Docker Desktop for Mac](https://docs.docker.com/desktop/install/mac-install/)
 
 * Add entries in `/etc/hosts` for all services running in docker containers:
 `hadoop-master`, `mysql`, `postgres`, `cassandra`, `presto-master`.
@@ -55,10 +55,10 @@ and deficiencies of `extends:` syntax (see the note
 [here](https://docs.docker.com/compose/extends/#extending-services)).
 
 
-To ease the pain of passing multiple `-f` arguments to `docker-compose`,
+To ease the pain of passing multiple `-f` arguments to `docker compose`,
 each environment has a `compose.sh` wrapper script. Thanks to it, instead of e.g.
 
-`docker-compose -f ./docker-compose.yml -f ../common/standard.yml [compose commands]`
+`docker compose -f ./docker-compose.yml -f ../common/standard.yml [compose commands]`
 
 one can simply write
 
@@ -405,7 +405,7 @@ running the debugger.
 
 ## Troubleshooting
 
-Use the `docker-compose` (probably using a [wrapper](#use-the-docker-compose-wrappers))
+Use the `docker compose` (probably using a [wrapper](#use-the-docker-compose-wrappers))
 and `docker` utilities to control and troubleshoot containers.
 In the following examples ``<profile>`` is [profiles](#profiles).
 

diff --git a/presto-product-tests/bin/lib.sh b/presto-product-tests/bin/lib.sh
@@ -2,7 +2,7 @@
 
 source "${BASH_SOURCE%/*}/locations.sh"
 
-# docker-compose down is not good enough because it's ignores services created with "run" command
+# docker compose down is not good enough because it's ignores services created with "run" command
 function stop_all_containers() {
   local ENVIRONMENT
   for ENVIRONMENT in $(getAvailableEnvironments)

diff --git a/presto-product-tests/bin/run_on_docker.sh b/presto-product-tests/bin/run_on_docker.sh
@@ -127,7 +127,7 @@ elif [[ "$ENVIRONMENT" == "multinode-tls-kerberos" ]]; then
 fi
 
 # check docker and docker compose installation
-docker-compose version
+docker compose version
 docker version
 
 stop_all_containers

diff --git a/presto-product-tests/conf/docker/common/compose-commons.sh b/presto-product-tests/conf/docker/common/compose-commons.sh
@@ -1,4 +1,4 @@
-# docker-compose has a limited understanding of relative paths and interprets them relative to
+# docker compose has a limited understanding of relative paths and interprets them relative to
 # compose-file location. We can't guarantee the shape of the paths coming from env variables,
 # so we canonicalize them.
 function export_canonical_path() {

diff --git a/presto-product-tests/conf/docker/common/standard.yml b/presto-product-tests/conf/docker/common/standard.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   java-8-base:

diff --git a/presto-product-tests/conf/docker/multinode-tls-kerberos/compose.sh b/presto-product-tests/conf/docker/multinode-tls-kerberos/compose.sh
@@ -4,7 +4,7 @@ SCRIPT_DIRECTORY=${BASH_SOURCE%/*}
 
 source ${SCRIPT_DIRECTORY}/../common/compose-commons.sh
 
-docker-compose \
+docker compose \
 -f ${SCRIPT_DIRECTORY}/../common/standard.yml \
 -f ${SCRIPT_DIRECTORY}/../common/kerberos.yml \
 -f ${SCRIPT_DIRECTORY}/docker-compose.yml \

diff --git a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/multinode-tls/compose.sh b/presto-product-tests/conf/docker/multinode-tls/compose.sh
@@ -6,7 +6,7 @@ SCRIPT_DIRECTORY=${BASH_SOURCE%/*}
 
 source "${SCRIPT_DIRECTORY}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${SCRIPT_DIRECTORY}/../common/standard.yml \
     -f ${SCRIPT_DIRECTORY}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/multinode/compose.sh b/presto-product-tests/conf/docker/multinode/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/multinode/docker-compose.yml b/presto-product-tests/conf/docker/multinode/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/singlenode-cassandra/compose.sh b/presto-product-tests/conf/docker/singlenode-cassandra/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/singlenode-cassandra/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-cassandra/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   cassandra:

diff --git a/presto-product-tests/conf/docker/singlenode-hdfs-impersonation/compose.sh b/presto-product-tests/conf/docker/singlenode-hdfs-impersonation/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/singlenode-hdfs-impersonation/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-hdfs-impersonation/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/singlenode-kafka/compose.sh b/presto-product-tests/conf/docker/singlenode-kafka/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/singlenode-kafka/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-kafka/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   kafka:

diff --git a/...o-product-tests/conf/docker/singlenode-kerberos-hdfs-impersonation-cross-realm/compose.sh b/...o-product-tests/conf/docker/singlenode-kerberos-hdfs-impersonation-cross-realm/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/../common/kerberos.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \

diff --git a/...t-tests/conf/docker/singlenode-kerberos-hdfs-impersonation-cross-realm/docker-compose.yml b/...t-tests/conf/docker/singlenode-kerberos-hdfs-impersonation-cross-realm/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/...-tests/conf/docker/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/compose.sh b/...-tests/conf/docker/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/compose.sh
@@ -2,7 +2,7 @@
 
 source ${BASH_SOURCE%/*}/../common/compose-commons.sh
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/../common/kerberos.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \

diff --git a/...onf/docker/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/docker-compose.yml b/...onf/docker/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/singlenode-kerberos-hdfs-impersonation/compose.sh b/presto-product-tests/conf/docker/singlenode-kerberos-hdfs-impersonation/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/../common/kerberos.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \

diff --git a/presto-product-tests/conf/docker/singlenode-kerberos-hdfs-impersonation/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-kerberos-hdfs-impersonation/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/singlenode-kerberos-hdfs-no-impersonation/compose.sh b/presto-product-tests/conf/docker/singlenode-kerberos-hdfs-no-impersonation/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/../common/kerberos.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \

diff --git a/...to-product-tests/conf/docker/singlenode-kerberos-hdfs-no-impersonation/docker-compose.yml b/...to-product-tests/conf/docker/singlenode-kerberos-hdfs-no-impersonation/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/singlenode-ldap/compose.sh b/presto-product-tests/conf/docker/singlenode-ldap/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   presto-master:

diff --git a/presto-product-tests/conf/docker/singlenode-mysql/compose.sh b/presto-product-tests/conf/docker/singlenode-mysql/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/singlenode-mysql/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-mysql/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   mysql:

diff --git a/presto-product-tests/conf/docker/singlenode-postgresql/compose.sh b/presto-product-tests/conf/docker/singlenode-postgresql/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"
diff --git a/presto-product-tests/conf/docker/singlenode-postgresql/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-postgresql/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
 
   postgres:

diff --git a/presto-product-tests/conf/docker/singlenode-sqlserver/compose.sh b/presto-product-tests/conf/docker/singlenode-sqlserver/compose.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/../common/compose-commons.sh"
 
-docker-compose \
+docker compose \
     -f ${BASH_SOURCE%/*}/../common/standard.yml \
     -f ${BASH_SOURCE%/*}/docker-compose.yml \
     "$@"