Skip to content

Commit ac7da49

Browse files
committed
[DEL] comments in docker-compose.yml files
1 parent a54aa6f commit ac7da49

File tree

3 files changed

+5
-121
lines changed

3 files changed

+5
-121
lines changed

docker/docker-compose-dev.yml

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ services:
1717
mem_limit: 500M
1818
mem_reservation: 150M
1919
mem_swappiness: 0
20+
2021
zeo:
2122
image: imiobe/iadelib:dev
2223
command: zeoserver
@@ -32,6 +33,7 @@ services:
3233
SERVICE_NAME: "zeo"
3334
healthcheck:
3435
test: "/plone/zeo_healthcheck.sh"
36+
3537
instance:
3638
image: imiobe/iadelib:dev
3739
command: instance
@@ -43,7 +45,6 @@ services:
4345
depends_on:
4446
- zeo
4547
- libreoffice
46-
# - worker-cron
4748
environment:
4849
- ZEO_CLIENT_CACHE_SIZE=1000MB
4950
- ZODB_CACHE_SIZE=100000
@@ -58,32 +59,7 @@ services:
5859
test: "curl -f localhost:8081/$$PLONE_PATH/@@ok"
5960
labels:
6061
SERVICE_NAME: "instance1"
61-
# worker-cron:
62-
# image: imiobe/iadelib:dev
63-
# command: instance-cron
64-
# ports:
65-
# - "8087:8087"
66-
# networks:
67-
# - delib_internal
68-
# - delib_external
69-
# depends_on:
70-
# - zeo
71-
# environment:
72-
# - ZEO_CLIENT_CACHE_SIZE=1000MB
73-
# - ZODB_CACHE_SIZE=100000
74-
# - ADMIN_PASSWORD=test
75-
# - PUBLIC_URL=http://localhost/PM
76-
# - PLONE_PATH=demo
77-
# - CLUSTER=iadelib_pm42
78-
# - HOSTNAME=worker-cron
79-
# volumes:
80-
# - ./data/:/data
81-
# - tmp:/tmp
82-
# - vartmp:/var/tmp
83-
# healthcheck:
84-
# test: "curl -f localhost:8087/$$PLONE_PATH/@@ok"
85-
# labels:
86-
# SERVICE_NAME: "worker-cron"
62+
8763
worker-async:
8864
image: imiobe/iadelib:dev
8965
command: instance-async
@@ -92,7 +68,6 @@ services:
9268
depends_on:
9369
- zeo
9470
- libreoffice
95-
# - worker-cron
9671
environment:
9772
- ZEO_CLIENT_CACHE_SIZE=1000MB
9873
- ZODB_CACHE_SIZE=100000
@@ -107,39 +82,7 @@ services:
10782
- vartmp:/var/tmp
10883
labels:
10984
SERVICE_NAME: "worker-async"
110-
# worker-amqp:
111-
# image: imiobe/iadelib:dev
112-
# command: instance-amqp
113-
# ports:
114-
# - "20085:8286"
115-
# networks:
116-
# - delib_internal
117-
# - delib_external
118-
# depends_on:
119-
# - zeo
120-
# - worker-cron
121-
# environment:
122-
# - ZEO_CLIENT_CACHE_SIZE=1000MB
123-
# - ZODB_CACHE_SIZE=100000
124-
# - CLUSTER=iadelib_pm42
125-
# - PLONE_PATH=demo
126-
# - MQ_CLIENT_ID
127-
# - MQ_WS_URL
128-
# - MQ_WS_LOGIN
129-
# - MQ_WS_PASSWORD
130-
# - MQ_HOST
131-
# - MQ_PORT
132-
# - MQ_LOGIN
133-
# - MQ_PASSWORD
134-
# - HOSTNAME=worker-amqp
135-
# healthcheck:
136-
# test: "curl -f localhost:8286/$$PLONE_PATH/@@ok"
137-
# volumes:
138-
# - ./data/:/data
139-
# - tmp:/tmp
140-
# - vartmp:/var/tmp
141-
# labels:
142-
# SERVICE_NAME: "worker-cron"
85+
14386
maintenance:
14487
image: imiobe/iadelib:dev
14588
ports:
@@ -166,6 +109,7 @@ services:
166109
- vartmp:/var/tmp
167110
labels:
168111
SERVICE_NAME: "maintenance"
112+
169113
volumes:
170114
tmp:
171115
vartmp:

docker/docker-compose.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ services:
4646
depends_on:
4747
- zeo
4848
- libreoffice
49-
# - worker-cron
5049
environment:
5150
- ZEO_CLIENT_CACHE_SIZE=1000MB
5251
- ZODB_CACHE_SIZE=100000
@@ -62,33 +61,6 @@ services:
6261
labels:
6362
SERVICE_NAME: "instance1"
6463

65-
# worker-cron:
66-
# image: imiobe/iadelib:latest
67-
# command: instance-cron
68-
# ports:
69-
# - "8087:8087"
70-
# networks:
71-
# - delib_internal
72-
# - delib_external
73-
# depends_on:
74-
# - zeo
75-
# environment:
76-
# - ZEO_CLIENT_CACHE_SIZE=1000MB
77-
# - ZODB_CACHE_SIZE=100000
78-
# - ADMIN_PASSWORD=test
79-
# - PUBLIC_URL=http://localhost/PM
80-
# - PLONE_PATH=demo
81-
# - CLUSTER=iadelib_pm42
82-
# - HOSTNAME=worker-cron
83-
# volumes:
84-
# - ./data:/data
85-
# - tmp:/tmp
86-
# - vartmp:/var/tmp
87-
# healthcheck:
88-
# test: "curl -f localhost:8087/$$PLONE_PATH/@@ok"
89-
# labels:
90-
# SERVICE_NAME: "worker-cron"
91-
9264
worker-async:
9365
image: imiobe/iadelib:latest
9466
command: instance-async
@@ -122,7 +94,6 @@ services:
12294
- delib_external
12395
depends_on:
12496
- zeo
125-
# - worker-cron
12697
environment:
12798
- ZEO_CLIENT_CACHE_SIZE=1000MB
12899
- ZODB_CACHE_SIZE=100000
@@ -156,7 +127,6 @@ services:
156127
depends_on:
157128
- zeo
158129
- libreoffice
159-
# - worker-cron
160130
environment:
161131
- ZEO_CLIENT_CACHE_SIZE=1000MB
162132
- ZODB_CACHE_SIZE=100000

docker/docker-entrypoint.sh

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,6 @@ function setup() {
1010
fi
1111
chmod 777 /data/*
1212
}
13-
# function wait_for_cron() {
14-
# echo "Waiting for cron"
15-
# URL="worker-cron:8087/$PLONE_PATH"
16-
# CURL="curl --write-out %{http_code} -so /dev/null $URL/@@ok"
17-
# MAX_TRIES=50
18-
# INTERVAL=5
19-
# set +e
20-
# SECONDS=0
21-
# response="404"
22-
# tries=0
23-
# while [[ $response != "200" && $tries -lt $MAX_TRIES ]]
24-
# do
25-
# sleep $INTERVAL
26-
# echo "Waiting for cron"
27-
# response=$($CURL)
28-
# ((tries+=1))
29-
# done
30-
# set -e
31-
# if [[ $tries == "$MAX_TRIES" ]]; then
32-
# echo "Failed to reach $URL after $SECONDS s"
33-
# exit 1
34-
# else
35-
# echo "$URL is up. Waited $SECONDS s"
36-
# fi
37-
# }
3813
function start() {
3914
echo "Starting $1"
4015
cmd="bin/$1"
@@ -61,11 +36,6 @@ function start() {
6136

6237
setup "$1"
6338

64-
#PRIORIY=instance-cron instance-debug maintenance script zeoserver"
65-
#if [[ "instance" == "$1" || ( ! $PRIORIY == *"$1"* && $# -gt 0 ) ]]; then
66-
# wait_for_cron "$1"
67-
#fi
68-
6939
case "$1" in
7040
"")
7141
exit 0

0 commit comments

Comments
 (0)