Skip to content

Commit 223b9cc

Browse files
AnastaZIukAnastaZIuk
committed
correct compose logic - keep compose per axis, have kazoo server per axis, update modules, update .gitignore
1 parent fe40245 commit 223b9cc

File tree

14 files changed

+503
-368
lines changed

14 files changed

+503
-368
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ android-sample/bin/*
2929
preprocessed.hlsl
3030
compiled.spv
3131
.vs/*
32+
*/__pycache__/*
33+
__pycache__/*

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
version: '3'
2+
3+
services:
4+
nabla.kazoo.server.dynamic.debug:
5+
image: ${THIS_PROJECT_BASE_IMAGE}
6+
container_name: dev.nabla.kazoo.server.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
7+
hostname: dev.nabla.kazoo.server.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
env_file:
9+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
networks:
11+
nabla.network:
12+
entrypoint: ["zkServer.cmd"]
13+
volumes:
14+
- type: bind
15+
source: ../../../../../
16+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
17+
healthcheck:
18+
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
19+
interval: 30s
20+
timeout: 10s
21+
retries: 3
22+
23+
nabla.cmake.dynamic.debug:
24+
image: ${THIS_PROJECT_BASE_IMAGE}
25+
container_name: dev.nabla.cmake.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
26+
hostname: dev.nabla.cmake.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
27+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
28+
env_file:
29+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
environment:
31+
- NBL_BUILD_DIR=${THIS_PROJECT_NABLA_DIRECTORY}/build/.docker/${THIS_PROJECT_PLATFORM}/${THIS_PROJECT_ARCH}/dynamic/debug
32+
networks:
33+
nabla.network:
34+
volumes:
35+
- type: bind
36+
source: ../../../../../
37+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
38+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "debug"]
39+
40+
nabla.build.dynamic.debug:
41+
image: ${THIS_PROJECT_BASE_IMAGE}
42+
container_name: dev.nabla.build.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
43+
hostname: dev.nabla.build.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
44+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
45+
env_file:
46+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
47+
networks:
48+
nabla.network:
49+
depends_on:
50+
nabla.cmake.dynamic.debug:
51+
condition: service_completed_successfully
52+
nabla.kazoo.server.dynamic.debug:
53+
condition: service_healthy
54+
volumes:
55+
- type: bind
56+
source: ../../../../../
57+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
58+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Debug", "--libType", "dynamic"]
59+
60+
nabla.cpack.dynamic.debug:
61+
image: ${THIS_PROJECT_BASE_IMAGE}
62+
container_name: dev.nabla.cpack.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
63+
hostname: dev.nabla.cpack.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
64+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
65+
env_file:
66+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
67+
networks:
68+
nabla.network:
69+
depends_on:
70+
nabla.build.dynamic.debug:
71+
condition: service_completed_successfully
72+
volumes:
73+
- type: bind
74+
source: ../../../../../
75+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
76+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "dynamic", "--config", "Debug"]
77+
78+
networks:
79+
nabla.network:
80+
external: true

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
version: '3'
2+
3+
services:
4+
nabla.kazoo.server.dynamic.release:
5+
image: ${THIS_PROJECT_BASE_IMAGE}
6+
container_name: dev.nabla.kazoo.server.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
7+
hostname: dev.nabla.kazoo.server.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
env_file:
9+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
networks:
11+
nabla.network:
12+
entrypoint: ["zkServer.cmd"]
13+
volumes:
14+
- type: bind
15+
source: ../../../../../
16+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
17+
healthcheck:
18+
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
19+
interval: 30s
20+
timeout: 10s
21+
retries: 3
22+
23+
nabla.cmake.dynamic.release:
24+
image: ${THIS_PROJECT_BASE_IMAGE}
25+
container_name: dev.nabla.cmake.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
26+
hostname: dev.nabla.cmake.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
27+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
28+
env_file:
29+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
networks:
31+
nabla.network:
32+
volumes:
33+
- type: bind
34+
source: ../../../../../
35+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
36+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "release"]
37+
38+
nabla.build.dynamic.release:
39+
image: ${THIS_PROJECT_BASE_IMAGE}
40+
container_name: dev.nabla.build.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
41+
hostname: dev.nabla.build.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
42+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
43+
env_file:
44+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
45+
networks:
46+
nabla.network:
47+
depends_on:
48+
nabla.cmake.dynamic.release:
49+
condition: service_completed_successfully
50+
nabla.kazoo.server.dynamic.release:
51+
condition: service_healthy
52+
volumes:
53+
- type: bind
54+
source: ../../../../../
55+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
56+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Release", "--libType", "dynamic"]
57+
58+
nabla.cpack.dynamic.release:
59+
image: ${THIS_PROJECT_BASE_IMAGE}
60+
container_name: dev.nabla.cpack.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
61+
hostname: dev.nabla.cpack.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
62+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
63+
env_file:
64+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
65+
networks:
66+
nabla.network:
67+
depends_on:
68+
nabla.build.dynamic.release:
69+
condition: service_completed_successfully
70+
volumes:
71+
- type: bind
72+
source: ../../../../../
73+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
74+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "dynamic", "--config", "Release"]
75+
76+
networks:
77+
nabla.network:
78+
external: true

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
version: '3'
2+
3+
services:
4+
nabla.kazoo.server.dynamic.relwithdebinfo:
5+
image: ${THIS_PROJECT_BASE_IMAGE}
6+
container_name: dev.nabla.kazoo.server.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
7+
hostname: dev.nabla.kazoo.server.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
env_file:
9+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
networks:
11+
nabla.network:
12+
entrypoint: ["zkServer.cmd"]
13+
volumes:
14+
- type: bind
15+
source: ../../../../../
16+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
17+
healthcheck:
18+
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
19+
interval: 30s
20+
timeout: 10s
21+
retries: 3
22+
23+
nabla.cmake.dynamic.relwithdebinfo:
24+
image: ${THIS_PROJECT_BASE_IMAGE}
25+
container_name: dev.nabla.cmake.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
26+
hostname: dev.nabla.cmake.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
27+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
28+
env_file:
29+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
environment:
31+
- NBL_BUILD_DIR=${THIS_PROJECT_NABLA_DIRECTORY}/build/.docker/${THIS_PROJECT_PLATFORM}/${THIS_PROJECT_ARCH}/dynamic/relwithdebinfo
32+
networks:
33+
nabla.network:
34+
volumes:
35+
- type: bind
36+
source: ../../../../../
37+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
38+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "relwithdebinfo"]
39+
40+
nabla.build.dynamic.relwithdebinfo:
41+
image: ${THIS_PROJECT_BASE_IMAGE}
42+
container_name: dev.nabla.build.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
43+
hostname: dev.nabla.build.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
44+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
45+
env_file:
46+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
47+
networks:
48+
nabla.network:
49+
depends_on:
50+
nabla.cmake.dynamic.relwithdebinfo:
51+
condition: service_completed_successfully
52+
nabla.kazoo.server.dynamic.relwithdebinfo:
53+
condition: service_healthy
54+
volumes:
55+
- type: bind
56+
source: ../../../../../
57+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
58+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "RelWithDebInfo", "--libType", "dynamic"]
59+
60+
nabla.cpack.dynamic.relwithdebinfo:
61+
image: ${THIS_PROJECT_BASE_IMAGE}
62+
container_name: dev.nabla.cpack.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
63+
hostname: dev.nabla.cpack.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
64+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
65+
env_file:
66+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
67+
networks:
68+
nabla.network:
69+
depends_on:
70+
nabla.build.dynamic.relwithdebinfo:
71+
condition: service_completed_successfully
72+
volumes:
73+
- type: bind
74+
source: ../../../../../
75+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
76+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "dynamic", "--config", "RelWithDebInfo"]
77+
78+
networks:
79+
nabla.network:
80+
external: true

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
version: '3'
2+
3+
services:
4+
nabla.kazoo.server.static.debug:
5+
image: ${THIS_PROJECT_BASE_IMAGE}
6+
container_name: dev.nabla.kazoo.server.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
7+
hostname: dev.nabla.kazoo.server.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
env_file:
9+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
10+
networks:
11+
nabla.network:
12+
entrypoint: ["zkServer.cmd"]
13+
volumes:
14+
- type: bind
15+
source: ../../../../../
16+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
17+
healthcheck:
18+
test: ["CMD", "ncpfmp.bat", "nbl.ci.dev.lib.kazoo", "--host", "localhost"]
19+
interval: 30s
20+
timeout: 10s
21+
retries: 3
22+
23+
nabla.cmake.static.debug:
24+
image: ${THIS_PROJECT_BASE_IMAGE}
25+
container_name: dev.nabla.cmake.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
26+
hostname: dev.nabla.cmake.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
27+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
28+
env_file:
29+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
30+
environment:
31+
- NBL_BUILD_DIR=${THIS_PROJECT_NABLA_DIRECTORY}/build/.docker/${THIS_PROJECT_PLATFORM}/${THIS_PROJECT_ARCH}/static/debug
32+
networks:
33+
nabla.network:
34+
volumes:
35+
- type: bind
36+
source: ../../../../../
37+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
38+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "static", "--config", "debug"]
39+
40+
nabla.build.static.debug:
41+
image: ${THIS_PROJECT_BASE_IMAGE}
42+
container_name: dev.nabla.build.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
43+
hostname: dev.nabla.build.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
44+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
45+
env_file:
46+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
47+
networks:
48+
nabla.network:
49+
depends_on:
50+
nabla.cmake.static.debug:
51+
condition: service_completed_successfully
52+
nabla.kazoo.server.static.debug:
53+
condition: service_healthy
54+
volumes:
55+
- type: bind
56+
source: ../../../../../
57+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
58+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Debug", "--libType", "static"]
59+
60+
nabla.cpack.static.debug:
61+
image: ${THIS_PROJECT_BASE_IMAGE}
62+
container_name: dev.nabla.cpack.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
63+
hostname: dev.nabla.cpack.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
64+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
65+
env_file:
66+
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
67+
networks:
68+
nabla.network:
69+
depends_on:
70+
nabla.build.static.debug:
71+
condition: service_completed_successfully
72+
volumes:
73+
- type: bind
74+
source: ../../../../../
75+
target: ${THIS_PROJECT_NABLA_DIRECTORY}
76+
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cpack", "--libType", "static", "--config", "Debug"]
77+
78+
networks:
79+
nabla.network:
80+
external: true

0 commit comments

Comments
 (0)