Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit fd8a8ff

Browse files
oscarpicasoscarpicas
authored
Fixed issues running docker-compose (#538)
1 parent 8f2da89 commit fd8a8ff

4 files changed

Lines changed: 22 additions & 14 deletions

File tree

‎lib/backend/resources/operations/embeddedfeatures/edgeproxy4subnet.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,12 @@ feature:
171171
targets:
172172
gateways: all
173173
run: |
174+
sleep 0.$((200 + RANDOM%600))
175+
grep edgeproxy4subnet ${SF_LOGDIR}/docker.log && sfExit
174176
echo "docker-compose -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml -p edgeproxy4subnet up -d" >> ${SF_LOGDIR}/docker.log 2>&1 || true
175-
sfRetryEx 15m 5 docker-compose -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml -p edgeproxy4subnet up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 193
177+
pgrep docker-compose && sfExit
178+
docker system prune -f || sfExit
179+
pgrep docker-compose || docker-compose -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml -p edgeproxy4subnet up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 193
176180
sfRetryEx 5m 5 "sfDoesDockerRunContainer edgeproxy4subnet:latest edgeproxy4subnet_proxy_1" || sfFail 194
177181
sfExit
178182
@@ -185,21 +189,21 @@ feature:
185189
run: |
186190
if [ -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml ]; then
187191
echo "docker-compose -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml -p edgeproxy4subnet rm --stop --force" >> ${SF_LOGDIR}/docker.log 2>&1 || true
188-
sfRetryEx 15m 5 docker-compose -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml -p edgeproxy4subnet rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 195
192+
docker-compose -f ${SF_ETCDIR}/edgeproxy4subnet/docker-compose.yml -p edgeproxy4subnet rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 195
189193
# docker secret rm safescale.edgeproxy.db_password &>/dev/null
190194
docker image rm -f edgeproxy4subnet:latest
191195
rm -rf ${SF_ETCDIR}/edgeproxy4subnet
192196
193197
else
194198
if [ -f ${SF_ETCDIR}/kong4gateway/docker-compose.yml ]; then
195199
echo "docker-compose -f ${SF_ETCDIR}/kong4gateway/docker-compose.yml -p kong4gateway rm --stop --force" >> ${SF_LOGDIR}/docker.log 2>&1 || true
196-
sfRetryEx 15m 5 docker-compose -f ${SF_ETCDIR}/kong4gateway/docker-compose.yml -p kong4gateway rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 196
200+
docker-compose -f ${SF_ETCDIR}/kong4gateway/docker-compose.yml -p kong4gateway rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 196
197201
docker image rm -f kong4gateway:latest
198202
rm -rf ${SF_ETCDIR}/kong4gateway
199203
fi
200204
if [ -f ${SF_ETCDIR}/kong/docker-compose.yml ]; then
201205
echo "docker-compose -f ${SF_ETCDIR}/kong/docker-compose.yml -p kong rm --stop --force" >> ${SF_LOGDIR}/docker.log 2>&1 || true
202-
sfRetryEx 15m 5 docker-compose -f ${SF_ETCDIR}/kong/docker-compose.yml -p kong rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 197
206+
docker-compose -f ${SF_ETCDIR}/kong/docker-compose.yml -p kong rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 197
203207
docker image rm -f kong:latest
204208
rm -rf ${SF_ETCDIR}/kong
205209
fi

‎lib/backend/resources/operations/embeddedfeatures/postgres4gateway.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,12 @@ feature:
9191
nodes: no
9292
run: |
9393
{{ if .HostIsGateway }}
94+
sleep 0.$((200 + RANDOM%600))
95+
grep postgres4gateway ${SF_LOGDIR}/docker.log && sfExit
9496
echo "docker-compose -f ${SF_ETCDIR}/postgres4gateway/docker-compose.yml -p postgres4gateway up -d" >> ${SF_LOGDIR}/docker.log 2>&1 || true
95-
sfRetryEx 10m 5 docker-compose -f ${SF_ETCDIR}/postgres4gateway/docker-compose.yml -p postgres4gateway up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 194
97+
pgrep docker-compose && sfExit
98+
docker system prune -f || sfExit
99+
pgrep docker-compose || docker-compose -f ${SF_ETCDIR}/postgres4gateway/docker-compose.yml -p postgres4gateway up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 194
96100
sfRetryEx 5m 5 "sfDoesDockerRunContainer postgres:11-alpine postgres4gateway_postgres_1" || sfFail 195
97101
sfExit
98102
{{ else }}
@@ -111,7 +115,7 @@ feature:
111115
run: |
112116
{{ if .HostIsGateway }}
113117
echo "docker-compose -f ${SF_ETCDIR}/postgres4gateway/docker-compose.yml -p postgres4gateway rm --stop --force" >> ${SF_LOGDIR}/docker.log 2>&1 || true
114-
sfRetryEx 10m 5 docker-compose -f ${SF_ETCDIR}/postgres4gateway/docker-compose.yml -p postgres4gateway rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 196
118+
docker-compose -f ${SF_ETCDIR}/postgres4gateway/docker-compose.yml -p postgres4gateway rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 196
115119
docker image rm -f postgres:11-alpine
116120
sfExit
117121
{{ else }}

‎lib/backend/resources/operations/embeddedfeatures/proxycache-server.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ feature:
164164
cd ${SF_TMPDIR} && rm -rf proxycache.image || sfFail 192
165165
166166
echo "docker-compose -f ${SF_VARDIR}/run/proxycache.compose.yml -p proxycache up -d" >> ${SF_LOGDIR}/docker.log 2>&1 || true
167-
sfRetryEx 15m 5 docker-compose -f ${SF_VARDIR}/run/proxycache.compose.yml -p proxycache up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 514
167+
docker-compose -f ${SF_VARDIR}/run/proxycache.compose.yml -p proxycache up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 514
168168
169169
remove:
170170
pace: container
@@ -174,25 +174,25 @@ feature:
174174
host: yes
175175
run: |
176176
echo "docker-compose -f ${SF_VARDIR}/run/proxycache.compose.yml rm -f" >> ${SF_LOGDIR}/docker.log 2>&1 || true
177-
sfRetryEx 15m 5 docker-compose -f ${SF_VARDIR}/run/proxycache.compose.yml rm -f >> ${SF_LOGDIR}/docker.log 2>&1
177+
docker-compose -f ${SF_VARDIR}/run/proxycache.compose.yml rm -f >> ${SF_LOGDIR}/docker.log 2>&1
178178
docker image rm -f proxycache:latest
179179
180180
service:
181181
start: |
182182
echo "docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml up -d" >> ${SF_LOGDIR}/docker.log 2>&1 || true
183-
sfRetryEx 15m 5 docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml up -d >> ${SF_LOGDIR}/docker.log 2>&1
183+
docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml up -d >> ${SF_LOGDIR}/docker.log 2>&1
184184
185185
stop: |
186186
echo "docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml down" >> ${SF_LOGDIR}/docker.log 2>&1 || true
187-
sfRetryEx 15m 5 docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml down >> ${SF_LOGDIR}/docker.log 2>&1
187+
docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml down >> ${SF_LOGDIR}/docker.log 2>&1
188188
189189
pause: |
190190
echo "docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml pause" >> ${SF_LOGDIR}/docker.log 2>&1 || true
191-
sfRetryEx 15m 5 docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml pause >> ${SF_LOGDIR}/docker.log 2>&1
191+
docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml pause >> ${SF_LOGDIR}/docker.log 2>&1
192192
193193
unpause: |
194194
echo "docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml unpause" >> ${SF_LOGDIR}/docker.log 2>&1 || true
195-
sfRetryEx 15m 5 docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml unpause >> ${SF_LOGDIR}/docker.log 2>&1
195+
docker-compose -f ${SF_VARDIR}/run/proxycache.feature.yml unpause >> ${SF_LOGDIR}/docker.log 2>&1
196196
197197
state: |
198198
docker ps | grep proxycache &>/dev/null

‎lib/backend/resources/operations/embeddedfeatures/remotedesktop.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ feature:
574574
# Starts remotedesktop container #
575575
###########################################################
576576
echo "docker-compose -f ${SF_ETCDIR}/remotedesktop/docker-compose.yml up -d" >> ${SF_LOGDIR}/docker.log 2>&1 || true
577-
sfRetryEx 15m 5 docker-compose -f ${SF_ETCDIR}/remotedesktop/docker-compose.yml up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 209
577+
docker-compose -f ${SF_ETCDIR}/remotedesktop/docker-compose.yml up -d >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 209
578578
sfExit
579579
580580
remove:
@@ -586,7 +586,7 @@ feature:
586586
masters: all
587587
run: |
588588
echo "docker-compose -f ${SF_ETCDIR}/remotedesktop/docker-compose.yml -p safescale/remotedesktop rm --stop --force" >> ${SF_LOGDIR}/docker.log 2>&1 || true
589-
sfRetryEx 15m 5 docker-compose -f ${SF_ETCDIR}/remotedesktop/docker-compose.yml -p safescale/remotedesktop rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 192
589+
docker-compose -f ${SF_ETCDIR}/remotedesktop/docker-compose.yml -p safescale/remotedesktop rm --stop --force >> ${SF_LOGDIR}/docker.log 2>&1 || sfFail 192
590590
docker image rm -f safescale/remotedesktop:latest || sfFail 193
591591
rm -rf ${SF_ETCDIR}/remotedesktop
592592
sfExit

0 commit comments

Comments
 (0)