[bigtop] branch master updated: BIGTOP-3685: make docker-provisioner to be used both in docker-compose v1 and v2 (#903)

[iw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b5228d5 BIGTOP-3685: make docker-provisioner to be used both in docker-compose v1 and v2 (#903)
8b5228d5 is described below

commit 8b5228d58909aad0078c46b2639542fed850370c
Author: Leona Yoda <yo...@oss.nttdata.com>
AuthorDate: Mon May 16 23:10:46 2022 +0900

    BIGTOP-3685: make docker-provisioner to be used both in docker-compose v1 and v2 (#903)
---
 provisioner/docker/docker-compose-cgroupv2.yml | 23 ++++++++++++-----------
 provisioner/docker/docker-compose.yml          | 25 +++++++++++++------------
 provisioner/docker/docker-hadoop.sh            |  8 ++++----
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/provisioner/docker/docker-compose-cgroupv2.yml b/provisioner/docker/docker-compose-cgroupv2.yml
index cee849e9..9f9bdbc4 100644
--- a/provisioner/docker/docker-compose-cgroupv2.yml
+++ b/provisioner/docker/docker-compose-cgroupv2.yml
@@ -13,14 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-bigtop:
-    image: ${DOCKER_IMAGE}
-    command: /sbin/init
-    domainname: bigtop.apache.org
-    privileged: true
-    mem_limit: ${MEM_LIMIT}
-    volumes:
-    - ../../:/bigtop-home
-    - ./config/hiera.yaml:/etc/puppet/hiera.yaml
-    - ./config/hieradata:/etc/puppet/hieradata
-    - ./config/hosts:/etc/hosts
+services:
+    bigtop:
+        image: ${DOCKER_IMAGE}
+        command: /sbin/init
+        domainname: bigtop.apache.org
+        privileged: true
+        mem_limit: ${MEM_LIMIT}
+        volumes:
+        - ../../:/bigtop-home
+        - ./config/hiera.yaml:/etc/puppet/hiera.yaml
+        - ./config/hieradata:/etc/puppet/hieradata
+        - ./config/hosts:/etc/hosts
diff --git a/provisioner/docker/docker-compose.yml b/provisioner/docker/docker-compose.yml
index b3bb1a42..ffab94e5 100644
--- a/provisioner/docker/docker-compose.yml
+++ b/provisioner/docker/docker-compose.yml
@@ -13,15 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-bigtop:
-    image: ${DOCKER_IMAGE}
-    command: /sbin/init
-    domainname: bigtop.apache.org
-    privileged: true
-    mem_limit: ${MEM_LIMIT}
-    volumes:
-    - ../../:/bigtop-home
-    - ./config/hiera.yaml:/etc/puppet/hiera.yaml
-    - ./config/hieradata:/etc/puppet/hieradata
-    - ./config/hosts:/etc/hosts
-    - /sys/fs/cgroup:/sys/fs/cgroup:ro
+services:
+    bigtop:
+        image: ${DOCKER_IMAGE}
+        command: /sbin/init
+        domainname: bigtop.apache.org
+        privileged: true
+        mem_limit: ${MEM_LIMIT}
+        volumes:
+        - ../../:/bigtop-home
+        - ./config/hiera.yaml:/etc/puppet/hiera.yaml
+        - ./config/hieradata:/etc/puppet/hieradata
+        - ./config/hosts:/etc/hosts
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index d172fe94..7049a12f 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -53,7 +53,7 @@ create() {
         log "Cluster already exist! Run ./$PROG -d to destroy the cluster or delete .provision_id file and containers manually."
         exit 1;
     fi
-    echo "`date +'%Y%m%d_%H%M%S'`_R$RANDOM" > .provision_id
+    echo "`date +'%Y%m%d_%H%M%S'`_r$RANDOM" > .provision_id
     PROVISION_ID=`cat .provision_id`
     # Create a shared /etc/hosts and hiera.yaml that will be both mounted to each container soon
     mkdir -p config/hieradata 2> /dev/null
@@ -128,7 +128,7 @@ create() {
 generate-hosts() {
     get_nodes
     for node in ${NODES[*]}; do
-        entry=`docker inspect --format "{{.NetworkSettings.IPAddress}} {{.Config.Hostname}}.{{.Config.Domainname}} {{.Config.Hostname}}" $node`
+        entry=`docker inspect --format "{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}} {{.Config.Hostname}}.{{.Config.Domainname}} {{.Config.Hostname}}" $node`
         docker exec ${NODES[0]} bash -c "echo $entry >> /etc/hosts"
     done
     wait
@@ -141,7 +141,7 @@ generate-config() {
     # add ip of all nodes to config
     get_nodes
     for node in ${NODES[*]}; do
-        this_node_ip=`docker inspect --format "{{.NetworkSettings.IPAddress}}" $node`
+        this_node_ip=`docker inspect -f "{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}" $node`
         node_list="$node_list$this_node_ip "
     done
     node_list=$(echo "$node_list" | xargs | sed 's/ /, /g')
@@ -405,7 +405,7 @@ while [ $# -gt 0 ]; do
         shift 2;;
     -n|--nexus)
         if [ $# -lt 2 ] || [[ $2 == -* ]]; then
-            NEXUS_IP=`docker inspect --format "{{.NetworkSettings.IPAddress}}" nexus`
+            NEXUS_IP=`docker inspect --format "{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}" nexus`
             if [ $? != 0 ]; then
                 log "No container named nexus exists. To create one:\n $ docker run -d --name nexus sonatype/nexus"
                 exit 1