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

Commit cb812d0

Browse files
committed
Control docker compose service startup order
Resolves #4649
1 parent 552d1a8 commit cb812d0

File tree

4 files changed

+36
-4
lines changed

4 files changed

+36
-4
lines changed

src/docker-compose/docker-compose-dood.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ services:
4343
wget --no-check-certificate -P /tmp/ https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz &&
4444
tar -xvf /tmp/docker-latest.tgz --directory /tmp/ &&
4545
mv /tmp/docker/docker /usr/local/bin &&
46-
/cnb/process/web"
46+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
47+
chmod a+x /tmp/wait-for-it.sh &&
48+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
4749
volumes:
4850
- /var/run/docker.sock:/var/run/docker.sock
4951

@@ -62,7 +64,9 @@ services:
6264
wget --no-check-certificate -P /tmp/ https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz &&
6365
tar -xvf /tmp/docker-latest.tgz --directory /tmp/ &&
6466
mv /tmp/docker/docker /usr/local/bin &&
65-
/cnb/process/web"
67+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
68+
chmod a+x /tmp/wait-for-it.sh &&
69+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
6670
volumes:
6771
- /var/run/docker.sock:/var/run/docker.sock
6872

src/docker-compose/docker-compose.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ services:
8383
depends_on:
8484
- kafka-broker
8585
- skipper-server
86+
entrypoint: >
87+
bin/sh -c "
88+
apt-get update && apt-get install --no-install-recommends -y wget &&
89+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
90+
chmod a+x /tmp/wait-for-it.sh &&
91+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
8692
restart: always
8793
volumes:
8894
- ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf}
@@ -126,6 +132,12 @@ services:
126132
- SPRING_DATASOURCE_PASSWORD=rootpw
127133
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
128134
- LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_SKIPPER_SERVER_DEPLOYER=ERROR
135+
entrypoint: >
136+
bin/sh -c "
137+
apt-get update && apt-get install --no-install-recommends -y wget &&
138+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
139+
chmod a+x /tmp/wait-for-it.sh &&
140+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
129141
restart: always
130142
volumes:
131143
- ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf}

src/templates/docker-compose/docker-compose-dood.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ services:
4343
wget --no-check-certificate -P /tmp/ https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz &&
4444
tar -xvf /tmp/docker-latest.tgz --directory /tmp/ &&
4545
mv /tmp/docker/docker /usr/local/bin &&
46-
/cnb/process/web"
46+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
47+
chmod a+x /tmp/wait-for-it.sh &&
48+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
4749
volumes:
4850
- /var/run/docker.sock:/var/run/docker.sock
4951

@@ -62,7 +64,9 @@ services:
6264
wget --no-check-certificate -P /tmp/ https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz &&
6365
tar -xvf /tmp/docker-latest.tgz --directory /tmp/ &&
6466
mv /tmp/docker/docker /usr/local/bin &&
65-
/cnb/process/web"
67+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
68+
chmod a+x /tmp/wait-for-it.sh &&
69+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
6670
volumes:
6771
- /var/run/docker.sock:/var/run/docker.sock
6872

src/templates/docker-compose/docker-compose.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ services:
8383
depends_on:
8484
- kafka-broker
8585
- skipper-server
86+
entrypoint: >
87+
bin/sh -c "
88+
apt-get update && apt-get install --no-install-recommends -y wget &&
89+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
90+
chmod a+x /tmp/wait-for-it.sh &&
91+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
8692
restart: always
8793
volumes:
8894
- ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf}
@@ -126,6 +132,12 @@ services:
126132
- SPRING_DATASOURCE_PASSWORD=rootpw
127133
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
128134
- LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_SKIPPER_SERVER_DEPLOYER=ERROR
135+
entrypoint: >
136+
bin/sh -c "
137+
apt-get update && apt-get install --no-install-recommends -y wget &&
138+
wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh &&
139+
chmod a+x /tmp/wait-for-it.sh &&
140+
/tmp/wait-for-it.sh mysql:3306 -- /cnb/process/web"
129141
restart: always
130142
volumes:
131143
- ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf}

0 commit comments

Comments
 (0)