Skip to content

Commit 8d758d5

Browse files
authored
chore(docker): remove tmp volume mounts after image update (#2976)
1 parent 5f91d8b commit 8d758d5

2 files changed

Lines changed: 0 additions & 51 deletions

File tree

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@ volumes:
3030
hg-store2-data:
3131

3232
# ── Shared service defaults ──────────────────────────────────────────
33-
# TODO: remove volume mounts below once images are published with new entrypoints
3433
x-pd-common: &pd-common
3534
image: hugegraph/pd:${HUGEGRAPH_VERSION:-latest}
3635
pull_policy: missing
3736
restart: unless-stopped
3837
networks: [hg-net]
39-
entrypoint: ["/hugegraph-pd/docker-entrypoint.sh"]
4038
healthcheck:
4139
test: ["CMD-SHELL", "curl -fsS http://localhost:8620/v1/health >/dev/null || exit 1"]
4240
interval: 15s
@@ -53,7 +51,6 @@ x-store-common: &store-common
5351
pd0: { condition: service_healthy }
5452
pd1: { condition: service_healthy }
5553
pd2: { condition: service_healthy }
56-
entrypoint: ["/hugegraph-store/docker-entrypoint.sh"]
5754
healthcheck:
5855
test: ["CMD-SHELL", "curl -fsS http://localhost:8520/v1/health >/dev/null || exit 1"]
5956
interval: 15s
@@ -70,7 +67,6 @@ x-server-common: &server-common
7067
store0: { condition: service_healthy }
7168
store1: { condition: service_healthy }
7269
store2: { condition: service_healthy }
73-
entrypoint: ["/hugegraph-server/docker-entrypoint.sh"]
7470
environment:
7571
STORE_REST: store0:8520
7672
HG_SERVER_BACKEND: hstore
@@ -103,7 +99,6 @@ services:
10399
ports: ["8620:8620", "8686:8686"]
104100
volumes:
105101
- hg-pd0-data:/hugegraph-pd/pd_data
106-
- ../hugegraph-pd/hg-pd-dist/docker/docker-entrypoint.sh:/hugegraph-pd/docker-entrypoint.sh
107102

108103
pd1:
109104
<<: *pd-common
@@ -122,7 +117,6 @@ services:
122117
ports: ["8621:8620", "8687:8686"]
123118
volumes:
124119
- hg-pd1-data:/hugegraph-pd/pd_data
125-
- ../hugegraph-pd/hg-pd-dist/docker/docker-entrypoint.sh:/hugegraph-pd/docker-entrypoint.sh
126120

127121
pd2:
128122
<<: *pd-common
@@ -141,7 +135,6 @@ services:
141135
ports: ["8622:8620", "8688:8686"]
142136
volumes:
143137
- hg-pd2-data:/hugegraph-pd/pd_data
144-
- ../hugegraph-pd/hg-pd-dist/docker/docker-entrypoint.sh:/hugegraph-pd/docker-entrypoint.sh
145138

146139
# --- Store cluster (3 nodes) ---
147140
store0:
@@ -158,7 +151,6 @@ services:
158151
ports: ["8500:8500", "8510:8510", "8520:8520"]
159152
volumes:
160153
- hg-store0-data:/hugegraph-store/storage
161-
- ../hugegraph-store/hg-store-dist/docker/docker-entrypoint.sh:/hugegraph-store/docker-entrypoint.sh
162154

163155
store1:
164156
<<: *store-common
@@ -174,7 +166,6 @@ services:
174166
ports: ["8501:8500", "8511:8510", "8521:8520"]
175167
volumes:
176168
- hg-store1-data:/hugegraph-store/storage
177-
- ../hugegraph-store/hg-store-dist/docker/docker-entrypoint.sh:/hugegraph-store/docker-entrypoint.sh
178169

179170
store2:
180171
<<: *store-common
@@ -190,35 +181,22 @@ services:
190181
ports: ["8502:8500", "8512:8510", "8522:8520"]
191182
volumes:
192183
- hg-store2-data:/hugegraph-store/storage
193-
- ../hugegraph-store/hg-store-dist/docker/docker-entrypoint.sh:/hugegraph-store/docker-entrypoint.sh
194184

195185
# --- Server cluster (3 nodes) ---
196186
server0:
197187
<<: *server-common
198188
container_name: hg-server0
199189
hostname: server0
200190
ports: ["8080:8080"]
201-
volumes:
202-
- ../hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh:/hugegraph-server/docker-entrypoint.sh
203-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh:/hugegraph-server/bin/wait-storage.sh
204-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-partition.sh:/hugegraph-server/bin/wait-partition.sh
205191

206192
server1:
207193
<<: *server-common
208194
container_name: hg-server1
209195
hostname: server1
210196
ports: ["8081:8080"]
211-
volumes:
212-
- ../hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh:/hugegraph-server/docker-entrypoint.sh
213-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh:/hugegraph-server/bin/wait-storage.sh
214-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-partition.sh:/hugegraph-server/bin/wait-partition.sh
215197

216198
server2:
217199
<<: *server-common
218200
container_name: hg-server2
219201
hostname: server2
220202
ports: ["8082:8080"]
221-
volumes:
222-
- ../hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh:/hugegraph-server/docker-entrypoint.sh
223-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh:/hugegraph-server/bin/wait-storage.sh
224-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-partition.sh:/hugegraph-server/bin/wait-partition.sh

docker/docker-compose.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
# TODO: remove volume mounts below once images are published with new entrypoints
1817
name: hugegraph-single
1918

2019
networks:
@@ -34,9 +33,6 @@ services:
3433
hostname: pd
3534
restart: unless-stopped
3635
networks: [hg-net]
37-
38-
entrypoint: ["/hugegraph-pd/docker-entrypoint.sh"]
39-
4036
environment:
4137
HG_PD_GRPC_HOST: pd
4238
HG_PD_GRPC_PORT: "8686"
@@ -45,85 +41,60 @@ services:
4541
HG_PD_RAFT_PEERS_LIST: pd:8610
4642
HG_PD_INITIAL_STORE_LIST: store:8500
4743
HG_PD_DATA_PATH: /hugegraph-pd/pd_data
48-
4944
ports:
5045
- "8620:8620"
51-
5246
volumes:
5347
- hg-pd-data:/hugegraph-pd/pd_data
54-
- ../hugegraph-pd/hg-pd-dist/docker/docker-entrypoint.sh:/hugegraph-pd/docker-entrypoint.sh
55-
5648
healthcheck:
5749
test: ["CMD-SHELL", "curl -fsS http://localhost:8620/v1/health >/dev/null || exit 1"]
5850
interval: 10s
5951
timeout: 5s
6052
retries: 12
6153
start_period: 30s
6254

63-
6455
store:
6556
image: hugegraph/store:${HUGEGRAPH_VERSION:-latest}
6657
pull_policy: always
6758
container_name: hg-store
6859
hostname: store
6960
restart: unless-stopped
7061
networks: [hg-net]
71-
72-
entrypoint: ["/hugegraph-store/docker-entrypoint.sh"]
73-
7462
depends_on:
7563
pd:
7664
condition: service_healthy
77-
7865
environment:
7966
HG_STORE_PD_ADDRESS: pd:8686
8067
HG_STORE_GRPC_HOST: store
8168
HG_STORE_GRPC_PORT: "8500"
8269
HG_STORE_REST_PORT: "8520"
8370
HG_STORE_RAFT_ADDRESS: store:8510
8471
HG_STORE_DATA_PATH: /hugegraph-store/storage
85-
8672
ports:
8773
- "8520:8520"
88-
8974
volumes:
9075
- hg-store-data:/hugegraph-store/storage
91-
- ../hugegraph-store/hg-store-dist/docker/docker-entrypoint.sh:/hugegraph-store/docker-entrypoint.sh
92-
9376
healthcheck:
9477
test: ["CMD-SHELL", "curl -fsS http://localhost:8520/v1/health >/dev/null || exit 1"]
9578
interval: 10s
9679
timeout: 10s
9780
retries: 30
9881
start_period: 60s
9982

100-
10183
server:
10284
image: hugegraph/server:${HUGEGRAPH_VERSION:-latest}
10385
pull_policy: always
10486
container_name: hg-server
10587
hostname: server
10688
restart: unless-stopped
10789
networks: [hg-net]
108-
109-
entrypoint: ["/hugegraph-server/docker-entrypoint.sh"]
110-
11190
depends_on:
11291
store:
11392
condition: service_healthy
114-
11593
environment:
11694
HG_SERVER_BACKEND: hstore
11795
HG_SERVER_PD_PEERS: pd:8686
118-
11996
ports:
12097
- "8080:8080"
121-
122-
volumes:
123-
- ../hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh:/hugegraph-server/docker-entrypoint.sh
124-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh:/hugegraph-server/bin/wait-storage.sh
125-
- ../hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-partition.sh:/hugegraph-server/bin/wait-partition.sh
126-
12798
healthcheck:
12899
test: ["CMD-SHELL", "curl -fsS http://localhost:8080/versions >/dev/null || exit 1"]
129100
interval: 10s

0 commit comments

Comments
 (0)