Skip to content

Commit 9cfd271

Browse files
AnastaZIukAnastaZIuk
committed
add missing profiles to kazoo, monitor shutdown requests and terminate kazoo serves after package module is done, let compose down services
1 parent 223b9cc commit 9cfd271

File tree

10 files changed

+85
-55
lines changed

10 files changed

+85
-55
lines changed

‎docker/compose/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,14 @@ RUN `
104104
&& setx PATH "%PATH%;%APACHE_ZOOKEEPER_INSTALL_DIRECTORY%\apache-zookeeper-3.8.3-bin\bin" /M
105105

106106
RUN `
107-
# Download kazoo Python 2.8.0 (more recent versions doesn't work well with Windows) module
107+
# Download kazoo 2.8.0 Python (more recent versions doesn't work well with Windows) module
108108
`
109109
python -m pip install kazoo==2.8.0
110+
111+
RUN `
112+
# Download psutil Python module
113+
`
114+
python -m pip install psutil
110115

111116
RUN `
112117
# Download OpenJDK 11 LTS

‎docker/compose/ci/stages/dev/axes/dynamic/debug/compose.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.kazoo.server.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.kazoo.server.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
89
env_file:
9-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
1112
nabla.network:
1213
entrypoint: ["zkServer.cmd"]
1314
volumes:
1415
- type: bind
15-
source: ../../../../../
16+
source: ../../../../../../../../
1617
target: ${THIS_PROJECT_NABLA_DIRECTORY}
1718
healthcheck:
1819
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
@@ -26,14 +27,14 @@ services:
2627
hostname: dev.nabla.cmake.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2728
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
2829
env_file:
29-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
3031
environment:
3132
- NBL_BUILD_DIR=${THIS_PROJECT_NABLA_DIRECTORY}/build/.docker/${THIS_PROJECT_PLATFORM}/${THIS_PROJECT_ARCH}/dynamic/debug
3233
networks:
3334
nabla.network:
3435
volumes:
3536
- type: bind
36-
source: ../../../../../
37+
source: ../../../../../../../../
3738
target: ${THIS_PROJECT_NABLA_DIRECTORY}
3839
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "debug"]
3940

@@ -43,7 +44,7 @@ services:
4344
hostname: dev.nabla.build.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
4445
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
4546
env_file:
46-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
47+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4748
networks:
4849
nabla.network:
4950
depends_on:
@@ -53,7 +54,7 @@ services:
5354
condition: service_healthy
5455
volumes:
5556
- type: bind
56-
source: ../../../../../
57+
source: ../../../../../../../../
5758
target: ${THIS_PROJECT_NABLA_DIRECTORY}
5859
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Debug", "--libType", "dynamic"]
5960

@@ -63,15 +64,15 @@ services:
6364
hostname: dev.nabla.cpack.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6465
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
6566
env_file:
66-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
67+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6768
networks:
6869
nabla.network:
6970
depends_on:
7071
nabla.build.dynamic.debug:
7172
condition: service_completed_successfully
7273
volumes:
7374
- type: bind
74-
source: ../../../../../
75+
source: ../../../../../../../../
7576
target: ${THIS_PROJECT_NABLA_DIRECTORY}
7677
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "dynamic", "--config", "Debug"]
7778

‎docker/compose/ci/stages/dev/axes/dynamic/release/compose.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.kazoo.server.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.kazoo.server.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
89
env_file:
9-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
1112
nabla.network:
1213
entrypoint: ["zkServer.cmd"]
1314
volumes:
1415
- type: bind
15-
source: ../../../../../
16+
source: ../../../../../../../../
1617
target: ${THIS_PROJECT_NABLA_DIRECTORY}
1718
healthcheck:
1819
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
@@ -26,12 +27,12 @@ services:
2627
hostname: dev.nabla.cmake.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2728
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
2829
env_file:
29-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
3031
networks:
3132
nabla.network:
3233
volumes:
3334
- type: bind
34-
source: ../../../../../
35+
source: ../../../../../../../../
3536
target: ${THIS_PROJECT_NABLA_DIRECTORY}
3637
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "release"]
3738

@@ -41,7 +42,7 @@ services:
4142
hostname: dev.nabla.build.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
4243
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
4344
env_file:
44-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
45+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4546
networks:
4647
nabla.network:
4748
depends_on:
@@ -51,7 +52,7 @@ services:
5152
condition: service_healthy
5253
volumes:
5354
- type: bind
54-
source: ../../../../../
55+
source: ../../../../../../../../
5556
target: ${THIS_PROJECT_NABLA_DIRECTORY}
5657
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Release", "--libType", "dynamic"]
5758

@@ -61,15 +62,15 @@ services:
6162
hostname: dev.nabla.cpack.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6263
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
6364
env_file:
64-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
65+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6566
networks:
6667
nabla.network:
6768
depends_on:
6869
nabla.build.dynamic.release:
6970
condition: service_completed_successfully
7071
volumes:
7172
- type: bind
72-
source: ../../../../../
73+
source: ../../../../../../../../
7374
target: ${THIS_PROJECT_NABLA_DIRECTORY}
7475
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "dynamic", "--config", "Release"]
7576

‎docker/compose/ci/stages/dev/axes/dynamic/relwithdebinfo/compose.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.kazoo.server.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.kazoo.server.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
89
env_file:
9-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
1112
nabla.network:
1213
entrypoint: ["zkServer.cmd"]
1314
volumes:
1415
- type: bind
15-
source: ../../../../../
16+
source: ../../../../../../../../
1617
target: ${THIS_PROJECT_NABLA_DIRECTORY}
1718
healthcheck:
1819
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
@@ -26,14 +27,14 @@ services:
2627
hostname: dev.nabla.cmake.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2728
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
2829
env_file:
29-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
3031
environment:
3132
- NBL_BUILD_DIR=${THIS_PROJECT_NABLA_DIRECTORY}/build/.docker/${THIS_PROJECT_PLATFORM}/${THIS_PROJECT_ARCH}/dynamic/relwithdebinfo
3233
networks:
3334
nabla.network:
3435
volumes:
3536
- type: bind
36-
source: ../../../../../
37+
source: ../../../../../../../../
3738
target: ${THIS_PROJECT_NABLA_DIRECTORY}
3839
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "relwithdebinfo"]
3940

@@ -43,7 +44,7 @@ services:
4344
hostname: dev.nabla.build.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
4445
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
4546
env_file:
46-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
47+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4748
networks:
4849
nabla.network:
4950
depends_on:
@@ -53,7 +54,7 @@ services:
5354
condition: service_healthy
5455
volumes:
5556
- type: bind
56-
source: ../../../../../
57+
source: ../../../../../../../../
5758
target: ${THIS_PROJECT_NABLA_DIRECTORY}
5859
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "RelWithDebInfo", "--libType", "dynamic"]
5960

@@ -63,15 +64,15 @@ services:
6364
hostname: dev.nabla.cpack.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6465
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
6566
env_file:
66-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
67+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6768
networks:
6869
nabla.network:
6970
depends_on:
7071
nabla.build.dynamic.relwithdebinfo:
7172
condition: service_completed_successfully
7273
volumes:
7374
- type: bind
74-
source: ../../../../../
75+
source: ../../../../../../../../
7576
target: ${THIS_PROJECT_NABLA_DIRECTORY}
7677
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "dynamic", "--config", "RelWithDebInfo"]
7778

‎docker/compose/ci/stages/dev/axes/static/debug/compose.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.kazoo.server.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.kazoo.server.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
89
env_file:
9-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
1112
nabla.network:
1213
entrypoint: ["zkServer.cmd"]
1314
volumes:
1415
- type: bind
15-
source: ../../../../../
16+
source: ../../../../../../../../
1617
target: ${THIS_PROJECT_NABLA_DIRECTORY}
1718
healthcheck:
1819
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
@@ -26,14 +27,14 @@ services:
2627
hostname: dev.nabla.cmake.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2728
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
2829
env_file:
29-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
3031
environment:
3132
- NBL_BUILD_DIR=${THIS_PROJECT_NABLA_DIRECTORY}/build/.docker/${THIS_PROJECT_PLATFORM}/${THIS_PROJECT_ARCH}/static/debug
3233
networks:
3334
nabla.network:
3435
volumes:
3536
- type: bind
36-
source: ../../../../../
37+
source: ../../../../../../../../
3738
target: ${THIS_PROJECT_NABLA_DIRECTORY}
3839
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "static", "--config", "debug"]
3940

@@ -43,7 +44,7 @@ services:
4344
hostname: dev.nabla.build.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
4445
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
4546
env_file:
46-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
47+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4748
networks:
4849
nabla.network:
4950
depends_on:
@@ -53,7 +54,7 @@ services:
5354
condition: service_healthy
5455
volumes:
5556
- type: bind
56-
source: ../../../../../
57+
source: ../../../../../../../../
5758
target: ${THIS_PROJECT_NABLA_DIRECTORY}
5859
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Debug", "--libType", "static"]
5960

@@ -63,15 +64,15 @@ services:
6364
hostname: dev.nabla.cpack.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6465
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
6566
env_file:
66-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
67+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6768
networks:
6869
nabla.network:
6970
depends_on:
7071
nabla.build.static.debug:
7172
condition: service_completed_successfully
7273
volumes:
7374
- type: bind
74-
source: ../../../../../
75+
source: ../../../../../../../../
7576
target: ${THIS_PROJECT_NABLA_DIRECTORY}
7677
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "static", "--config", "Debug"]
7778

‎docker/compose/ci/stages/dev/axes/static/release/compose.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.kazoo.server.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.kazoo.server.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "static", "dev.static", "dev.static.release"]
89
env_file:
9-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
1112
nabla.network:
1213
entrypoint: ["zkServer.cmd"]
1314
volumes:
1415
- type: bind
15-
source: ../../../../../
16+
source: ../../../../../../../../
1617
target: ${THIS_PROJECT_NABLA_DIRECTORY}
1718
healthcheck:
1819
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
@@ -26,12 +27,12 @@ services:
2627
hostname: dev.nabla.cmake.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2728
profiles: ["dev", "static", "dev.static", "dev.static.release"]
2829
env_file:
29-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
3031
networks:
3132
nabla.network:
3233
volumes:
3334
- type: bind
34-
source: ../../../../../
35+
source: ../../../../../../../../
3536
target: ${THIS_PROJECT_NABLA_DIRECTORY}
3637
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "static", "--config", "release"]
3738

@@ -41,7 +42,7 @@ services:
4142
hostname: dev.nabla.build.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
4243
profiles: ["dev", "static", "dev.static", "dev.static.release"]
4344
env_file:
44-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
45+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4546
networks:
4647
nabla.network:
4748
depends_on:
@@ -51,7 +52,7 @@ services:
5152
condition: service_healthy
5253
volumes:
5354
- type: bind
54-
source: ../../../../../
55+
source: ../../../../../../../../
5556
target: ${THIS_PROJECT_NABLA_DIRECTORY}
5657
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Release", "--libType", "static"]
5758

@@ -61,15 +62,15 @@ services:
6162
hostname: dev.nabla.cpack.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6263
profiles: ["dev", "static", "dev.static", "dev.static.release"]
6364
env_file:
64-
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
65+
- ../../../../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6566
networks:
6667
nabla.network:
6768
depends_on:
6869
nabla.build.static.release:
6970
condition: service_completed_successfully
7071
volumes:
7172
- type: bind
72-
source: ../../../../../
73+
source: ../../../../../../../../
7374
target: ${THIS_PROJECT_NABLA_DIRECTORY}
7475
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "static", "--config", "Release"]
7576

0 commit comments

Comments
 (0)