Skip to content

Commit 9d925bc

Browse files
AnastaZIukAnastaZIuk
committed
add profiles to services - organise into "dev", "${libraryType}", "dev.${libraryType}", "dev.${libraryType}.${config}", grant flexibility for local CI pipelines execution
1 parent 01a2fec commit 9d925bc

File tree

5 files changed

+22
-2
lines changed

5 files changed

+22
-2
lines changed

‎docker/compose/ci/stages/dev/build/compose.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.build.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.build.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "static", "dev.static", "dev.static.release"]
89
env_file:
910
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
@@ -23,6 +24,7 @@ services:
2324
image: ${THIS_PROJECT_BASE_IMAGE}
2425
container_name: dev.nabla.build.static.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2526
hostname: dev.nabla.build.static.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
27+
profiles: ["dev", "static", "dev.static", "dev.static.relwithdebinfo"]
2628
env_file:
2729
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
2830
networks:
@@ -41,6 +43,7 @@ services:
4143
image: ${THIS_PROJECT_BASE_IMAGE}
4244
container_name: dev.nabla.build.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
4345
hostname: dev.nabla.build.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
46+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
4447
env_file:
4548
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4649
networks:
@@ -59,6 +62,7 @@ services:
5962
image: ${THIS_PROJECT_BASE_IMAGE}
6063
container_name: dev.nabla.build.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6164
hostname: dev.nabla.build.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
65+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
6266
env_file:
6367
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6468
networks:
@@ -77,6 +81,7 @@ services:
7781
image: ${THIS_PROJECT_BASE_IMAGE}
7882
container_name: dev.nabla.build.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
7983
hostname: dev.nabla.build.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
84+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
8085
env_file:
8186
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
8287
networks:
@@ -95,6 +100,7 @@ services:
95100
image: ${THIS_PROJECT_BASE_IMAGE}
96101
container_name: dev.nabla.build.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
97102
hostname: dev.nabla.build.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
103+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
98104
env_file:
99105
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
100106
networks:

‎docker/compose/ci/stages/dev/cmake/compose.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.cmake.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.cmake.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "static", "dev.static", "dev.static.release"]
89
env_file:
910
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
@@ -18,6 +19,7 @@ services:
1819
image: ${THIS_PROJECT_BASE_IMAGE}
1920
container_name: dev.nabla.cmake.static.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2021
hostname: dev.nabla.cmake.static.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
22+
profiles: ["dev", "static", "dev.static", "dev.static.relwithdebinfo"]
2123
env_file:
2224
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
2325
environment:
@@ -33,6 +35,7 @@ services:
3335
image: ${THIS_PROJECT_BASE_IMAGE}
3436
container_name: dev.nabla.cmake.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
3537
hostname: dev.nabla.cmake.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
38+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
3639
env_file:
3740
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
3841
environment:
@@ -48,6 +51,7 @@ services:
4851
image: ${THIS_PROJECT_BASE_IMAGE}
4952
container_name: dev.nabla.cmake.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
5053
hostname: dev.nabla.cmake.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
54+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
5155
env_file:
5256
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
5357
environment:
@@ -63,6 +67,7 @@ services:
6367
image: ${THIS_PROJECT_BASE_IMAGE}
6468
container_name: dev.nabla.cmake.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
6569
hostname: dev.nabla.cmake.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
70+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
6671
env_file:
6772
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
6873
environment:
@@ -78,6 +83,7 @@ services:
7883
image: ${THIS_PROJECT_BASE_IMAGE}
7984
container_name: dev.nabla.cmake.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8085
hostname: dev.nabla.cmake.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
86+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
8187
env_file:
8288
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
8389
environment:

‎docker/compose/ci/stages/dev/cpack/compose.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ services:
55
image: ${THIS_PROJECT_BASE_IMAGE}
66
container_name: dev.nabla.cpack.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
77
hostname: dev.nabla.cpack.static.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8+
profiles: ["dev", "static", "dev.static", "dev.static.release"]
89
env_file:
910
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
1011
networks:
@@ -21,6 +22,7 @@ services:
2122
image: ${THIS_PROJECT_BASE_IMAGE}
2223
container_name: dev.nabla.cpack.static.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
2324
hostname: dev.nabla.cpack.static.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
25+
profiles: ["dev", "static", "dev.static", "dev.static.relwithdebinfo"]
2426
env_file:
2527
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
2628
networks:
@@ -37,6 +39,7 @@ services:
3739
image: ${THIS_PROJECT_BASE_IMAGE}
3840
container_name: dev.nabla.cpack.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
3941
hostname: dev.nabla.cpack.static.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
42+
profiles: ["dev", "static", "dev.static", "dev.static.debug"]
4043
env_file:
4144
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
4245
networks:
@@ -53,6 +56,7 @@ services:
5356
image: ${THIS_PROJECT_BASE_IMAGE}
5457
container_name: dev.nabla.cpack.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
5558
hostname: dev.nabla.cpack.dynamic.release.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
59+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.release"]
5660
env_file:
5761
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
5862
networks:
@@ -69,6 +73,7 @@ services:
6973
image: ${THIS_PROJECT_BASE_IMAGE}
7074
container_name: dev.nabla.cpack.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
7175
hostname: dev.nabla.cpack.dynamic.relwithdebinfo.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
76+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.relwithdebinfo"]
7277
env_file:
7378
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
7479
networks:
@@ -85,6 +90,7 @@ services:
8590
image: ${THIS_PROJECT_BASE_IMAGE}
8691
container_name: dev.nabla.cpack.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
8792
hostname: dev.nabla.cpack.dynamic.debug.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
93+
profiles: ["dev", "dynamic", "dev.dynamic", "dev.dynamic.debug"]
8894
env_file:
8995
- ../.env/platform/${THIS_PROJECT_PLATFORM}/.env
9096
networks:

‎docker/compose/ci/stages/dev/kazoo/compose.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ version: '3'
33
services:
44
nabla.kazoo.server:
55
image: ${THIS_PROJECT_BASE_IMAGE}
6-
restart: always
76
container_name: dev.nabla.kazoo.server.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
87
hostname: dev.nabla.kazoo.server.${THIS_PROJECT_ARCH}.${THIS_PROJECT_PLATFORM}
98
env_file:

‎docker/dev.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ def parseInputArguments():
66

77
parser.add_argument("--platform", help="Target platform", type=str, default="windows")
88
parser.add_argument("--arch", help="Target arch", type=str, default="x86_64")
9+
parser.add_argument('--profiles', nargs='*', default=["dev.dynamic.debug"], help='Target list of profiles to apply')
910

1011
args = parser.parse_args()
1112

@@ -34,14 +35,16 @@ def main():
3435
subprocess.run(["docker", "network", "create", "--driver", "nat", "--subnet", "172.28.0.0/16", "--gateway", "172.28.5.1", "nabla.network"], check=True) # create nabla.network network if not present
3536

3637
envFile = os.path.abspath(f"../.env/platform/{platform}/.env")
38+
profiles = (lambda profiles: [item for profile in profiles for item in ["--profile", profile]])(args.profiles)
3739

3840
compose = [
3941
"docker", "compose",
4042
"-f", f"./compose.yml",
4143
"--env-file", envFile
42-
]
44+
] + profiles
4345

4446
subprocess.run(compose + ["build"], check=True)
47+
subprocess.run(compose + ["config"], check=True)
4548
subprocess.run(compose + ["create", "--force-recreate"], check=True)
4649
subprocess.run(compose + ["up"], check=True)
4750
subprocess.run(compose + ["down"], check=True)

0 commit comments

Comments
 (0)