docker: address maintainer feedback — pull_policy missing, remove sed blocks, fix network config

Author: bitflicker64

docker/docker-compose-3pd-3store-3server.yml

@@ -1,4 +1,4 @@
-#
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -20,9 +20,6 @@ name: hugegraph-3x3
 networks:
   hg-net:
     driver: bridge
-    ipam:
-      config:
-        - subnet: 172.20.0.0/24
 
 volumes:
   hg-pd0-data:
@@ -36,8 +33,9 @@ volumes:
 
 x-pd-common: &pd-common
   image: hugegraph/pd:${HUGEGRAPH_VERSION:-latest}
-  pull_policy: always
+  pull_policy: missing
   restart: unless-stopped
+  networks: [hg-net]
   entrypoint: ["/hugegraph-pd/docker-entrypoint.sh"]
   healthcheck:
     test: ["CMD-SHELL", "curl -fsS http://localhost:8620/v1/health >/dev/null || exit 1"]
@@ -48,7 +46,7 @@ x-pd-common: &pd-common
 
 x-store-common: &store-common
   image: hugegraph/store:${HUGEGRAPH_VERSION:-latest}
-  pull_policy: always
+  pull_policy: missing
   restart: unless-stopped
   networks: [hg-net]
   depends_on:
@@ -65,7 +63,7 @@ x-store-common: &store-common
 
 x-server-common: &server-common
   image: hugegraph/server:${HUGEGRAPH_VERSION:-latest}
-  pull_policy: always
+  pull_policy: missing
   restart: unless-stopped
   networks: [hg-net]
   depends_on:
@@ -76,7 +74,7 @@ x-server-common: &server-common
   environment:
     STORE_REST: store0:8520
     HG_SERVER_BACKEND: hstore
-    HG_SERVER_PD_PEERS: 172.20.0.10:8686,172.20.0.11:8686,172.20.0.12:8686
+    HG_SERVER_PD_PEERS: pd0:8686,pd1:8686,pd2:8686
   healthcheck:
     test: ["CMD-SHELL", "curl -fsS http://localhost:8080/versions >/dev/null || exit 1"]
     interval: 10s
@@ -92,15 +90,13 @@ services:
     <<: *pd-common
     container_name: hg-pd0
     hostname: pd0
-    networks:
-      hg-net:
-        ipv4_address: 172.20.0.10
+    networks: [ hg-net ]
     environment:
-      HG_PD_GRPC_HOST: 172.20.0.10
+      HG_PD_GRPC_HOST: pd0
       HG_PD_GRPC_PORT: "8686"
       HG_PD_REST_PORT: "8620"
-      HG_PD_RAFT_ADDRESS: 172.20.0.10:8610
-      HG_PD_RAFT_PEERS_LIST: 172.20.0.10:8610,172.20.0.11:8610,172.20.0.12:8610
+      HG_PD_RAFT_ADDRESS: pd0:8610
+      HG_PD_RAFT_PEERS_LIST: pd0:8610,pd1:8610,pd2:8610
       HG_PD_INITIAL_STORE_LIST: store0:8500,store1:8500,store2:8500
       HG_PD_DATA_PATH: /hugegraph-pd/pd_data
       HG_PD_INITIAL_STORE_COUNT: 3
@@ -113,15 +109,13 @@ services:
     <<: *pd-common
     container_name: hg-pd1
     hostname: pd1
-    networks:
-      hg-net:
-        ipv4_address: 172.20.0.11
+    networks: [ hg-net ]
     environment:
-      HG_PD_GRPC_HOST: 172.20.0.11
+      HG_PD_GRPC_HOST: pd1
       HG_PD_GRPC_PORT: "8686"
       HG_PD_REST_PORT: "8620"
-      HG_PD_RAFT_ADDRESS: 172.20.0.11:8610
-      HG_PD_RAFT_PEERS_LIST: 172.20.0.10:8610,172.20.0.11:8610,172.20.0.12:8610
+      HG_PD_RAFT_ADDRESS: pd1:8610
+      HG_PD_RAFT_PEERS_LIST: pd0:8610,pd1:8610,pd2:8610
       HG_PD_INITIAL_STORE_LIST: store0:8500,store1:8500,store2:8500
       HG_PD_DATA_PATH: /hugegraph-pd/pd_data
       HG_PD_INITIAL_STORE_COUNT: 3
@@ -134,15 +128,13 @@ services:
     <<: *pd-common
     container_name: hg-pd2
     hostname: pd2
-    networks:
-      hg-net:
-        ipv4_address: 172.20.0.12
+    networks: [ hg-net ]
     environment:
-      HG_PD_GRPC_HOST: 172.20.0.12
+      HG_PD_GRPC_HOST: pd2
       HG_PD_GRPC_PORT: "8686"
       HG_PD_REST_PORT: "8620"
-      HG_PD_RAFT_ADDRESS: 172.20.0.12:8610
-      HG_PD_RAFT_PEERS_LIST: 172.20.0.10:8610,172.20.0.11:8610,172.20.0.12:8610
+      HG_PD_RAFT_ADDRESS: pd2:8610
+      HG_PD_RAFT_PEERS_LIST: pd0:8610,pd1:8610,pd2:8610
       HG_PD_INITIAL_STORE_LIST: store0:8500,store1:8500,store2:8500
       HG_PD_DATA_PATH: /hugegraph-pd/pd_data
       HG_PD_INITIAL_STORE_COUNT: 3
@@ -157,7 +149,7 @@ services:
     container_name: hg-store0
     hostname: store0
     environment:
-      HG_STORE_PD_ADDRESS: 172.20.0.10:8686,172.20.0.11:8686,172.20.0.12:8686
+      HG_STORE_PD_ADDRESS: pd0:8686,pd1:8686,pd2:8686
       HG_STORE_GRPC_HOST: store0
       HG_STORE_GRPC_PORT: "8500"
       HG_STORE_REST_PORT: "8520"
@@ -173,7 +165,7 @@ services:
     container_name: hg-store1
     hostname: store1
     environment:
-      HG_STORE_PD_ADDRESS: 172.20.0.10:8686,172.20.0.11:8686,172.20.0.12:8686
+      HG_STORE_PD_ADDRESS: pd0:8686,pd1:8686,pd2:8686
       HG_STORE_GRPC_HOST: store1
       HG_STORE_GRPC_PORT: "8500"
       HG_STORE_REST_PORT: "8520"
@@ -189,7 +181,7 @@ services:
     container_name: hg-store2
     hostname: store2
     environment:
-      HG_STORE_PD_ADDRESS: 172.20.0.10:8686,172.20.0.11:8686,172.20.0.12:8686
+      HG_STORE_PD_ADDRESS: pd0:8686,pd1:8686,pd2:8686
       HG_STORE_GRPC_HOST: store2
       HG_STORE_GRPC_PORT: "8500"
       HG_STORE_REST_PORT: "8520"

hugegraph-pd/hg-pd-dist/docker/docker-entrypoint.sh

@@ -82,12 +82,5 @@ log "  pd.initial-store-list=${HG_PD_INITIAL_STORE_LIST}"
 log "  pd.initial-store-count=${HG_PD_INITIAL_STORE_COUNT}"
 log "  pd.data-path=${HG_PD_DATA_PATH}"
 
-log "Patching conf/application.yml with cluster settings..."
-sed -i "s|address: 127.0.0.1:8610|address: ${HG_PD_RAFT_ADDRESS}|"                   conf/application.yml
-sed -i "s|peers-list: 127.0.0.1:8610|peers-list: ${HG_PD_RAFT_PEERS_LIST}|"          conf/application.yml
-sed -i "s|initial-store-list: 127.0.0.1:8500|initial-store-list: ${HG_PD_INITIAL_STORE_LIST}|" conf/application.yml
-sed -i "s|initial-store-count: 1|initial-store-count: ${HG_PD_INITIAL_STORE_COUNT}|"  conf/application.yml
-sed -i "s|host: 127.0.0.1|host: ${HG_PD_GRPC_HOST}|"                                 conf/application.yml
-
 ./bin/start-hugegraph-pd.sh -j "${JAVA_OPTS:-}"
 tail -f /dev/null

hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh

@@ -81,11 +81,11 @@ else
     log "HugeGraph initialization already done. Skipping re-init..."
 fi
 
-./bin/start-hugegraph.sh -j "${JAVA_OPTS:-}" -t 120
-
-STORE_REST="${STORE_REST:-hg-store:8520}"
+STORE_REST="${STORE_REST:-store:8520}"
 export STORE_REST
 
+./bin/start-hugegraph.sh -j "${JAVA_OPTS:-}" -t 120
+
 # Post-startup cluster stabilization check
 ./bin/wait-partition.sh || log "WARN: partitions not assigned yet"
 

hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh

@@ -37,9 +37,7 @@ log() {
   echo "[wait-storage] $1"
 }
 
-# Hardcoded PD auth
-PD_AUTH_ARGS="-u store:admin"
-log "PD auth forced to store:admin"
+PD_AUTH_ARGS="-u ${PD_AUTH_USER:-store}:${PD_AUTH_PASSWORD:-admin}"
 
 function key_exists {
     local key=$1

hugegraph-store/hg-store-dist/docker/docker-entrypoint.sh

@@ -77,10 +77,5 @@ log "  raft.address=${HG_STORE_RAFT_ADDRESS}"
 log "  server.port=${HG_STORE_REST_PORT}"
 log "  app.data-path=${HG_STORE_DATA_PATH}"
 
-log "Patching conf/application.yml with cluster settings..."
-sed -i "s|address: localhost:8686|address: ${HG_STORE_PD_ADDRESS}|"   conf/application.yml
-sed -i "s|host: 127.0.0.1|host: ${HG_STORE_GRPC_HOST}|"              conf/application.yml
-sed -i "s|address: 127.0.0.1:8510|address: ${HG_STORE_RAFT_ADDRESS}|" conf/application.yml
-
 ./bin/start-hugegraph-store.sh -j "${JAVA_OPTS:-}"
 tail -f /dev/null