Skip to content

Commit 01a2fec

Browse files
AnastaZIukAnastaZIuk
committed
Remove ssh persistent volume from compose, we don't need it since we work with host's codebase, submodules update operation which requires authentication is performed by dev.py script on host
1 parent ae6d869 commit 01a2fec

File tree

8 files changed

+4
-147
lines changed

8 files changed

+4
-147
lines changed

‎docker/compose/ci/stages/.env/platform/windows/.env‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ THIS_PROJECT_WORKING_DIRECTORY="C:\docker"
55
THIS_PROJECT_ARTIFACTORY_NABLA_DIRECTORY="C:/Users/ContainerAdministrator/Nabla/artifactory"
66
THIS_PROJECT_NABLA_DIRECTORY="C:/Users/ContainerAdministrator/Nabla/bind"
77
NABLA_TARGET_REVISION="docker"
8-
THIS_PROJECT_SSH_DIRECTORY="C:/Users/ContainerAdministrator/.ssh"
98
THIS_PROJECT_DEBUG=""

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

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ services:
1515
nabla.kazoo.server:
1616
condition: service_healthy
1717
volumes:
18-
- type: volume
19-
source: ssh
20-
target: ${THIS_PROJECT_SSH_DIRECTORY}
2118
- type: bind
2219
source: ../../../../../
2320
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -36,9 +33,6 @@ services:
3633
nabla.kazoo.server:
3734
condition: service_healthy
3835
volumes:
39-
- type: volume
40-
source: ssh
41-
target: ${THIS_PROJECT_SSH_DIRECTORY}
4236
- type: bind
4337
source: ../../../../../
4438
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -57,9 +51,6 @@ services:
5751
nabla.kazoo.server:
5852
condition: service_healthy
5953
volumes:
60-
- type: volume
61-
source: ssh
62-
target: ${THIS_PROJECT_SSH_DIRECTORY}
6354
- type: bind
6455
source: ../../../../../
6556
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -78,9 +69,6 @@ services:
7869
nabla.kazoo.server:
7970
condition: service_healthy
8071
volumes:
81-
- type: volume
82-
source: ssh
83-
target: ${THIS_PROJECT_SSH_DIRECTORY}
8472
- type: bind
8573
source: ../../../../../
8674
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -99,9 +87,6 @@ services:
9987
nabla.kazoo.server:
10088
condition: service_healthy
10189
volumes:
102-
- type: volume
103-
source: ssh
104-
target: ${THIS_PROJECT_SSH_DIRECTORY}
10590
- type: bind
10691
source: ../../../../../
10792
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -120,18 +105,11 @@ services:
120105
nabla.kazoo.server:
121106
condition: service_healthy
122107
volumes:
123-
- type: volume
124-
source: ssh
125-
target: ${THIS_PROJECT_SSH_DIRECTORY}
126108
- type: bind
127109
source: ../../../../../
128110
target: ${THIS_PROJECT_NABLA_DIRECTORY}
129111
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.build", "--config", "Debug", "--libType", "dynamic"]
130112

131113
networks:
132114
nabla.network:
133-
external: true
134-
135-
volumes:
136-
ssh:
137-
external: true
115+
external: true

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

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ services:
1010
networks:
1111
nabla.network:
1212
volumes:
13-
- type: volume
14-
source: ssh
15-
target: ${THIS_PROJECT_SSH_DIRECTORY}
1613
- type: bind
1714
source: ../../../../../
1815
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -28,9 +25,6 @@ services:
2825
networks:
2926
nabla.network:
3027
volumes:
31-
- type: volume
32-
source: ssh
33-
target: ${THIS_PROJECT_SSH_DIRECTORY}
3428
- type: bind
3529
source: ../../../../../
3630
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -46,9 +40,6 @@ services:
4640
networks:
4741
nabla.network:
4842
volumes:
49-
- type: volume
50-
source: ssh
51-
target: ${THIS_PROJECT_SSH_DIRECTORY}
5243
- type: bind
5344
source: ../../../../../
5445
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -64,9 +55,6 @@ services:
6455
networks:
6556
nabla.network:
6657
volumes:
67-
- type: volume
68-
source: ssh
69-
target: ${THIS_PROJECT_SSH_DIRECTORY}
7058
- type: bind
7159
source: ../../../../../
7260
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -82,9 +70,6 @@ services:
8270
networks:
8371
nabla.network:
8472
volumes:
85-
- type: volume
86-
source: ssh
87-
target: ${THIS_PROJECT_SSH_DIRECTORY}
8873
- type: bind
8974
source: ../../../../../
9075
target: ${THIS_PROJECT_NABLA_DIRECTORY}
@@ -100,18 +85,11 @@ services:
10085
networks:
10186
nabla.network:
10287
volumes:
103-
- type: volume
104-
source: ssh
105-
target: ${THIS_PROJECT_SSH_DIRECTORY}
10688
- type: bind
10789
source: ../../../../../
10890
target: ${THIS_PROJECT_NABLA_DIRECTORY}
10991
entrypoint: ["ncpfmp.bat", "nbl.ci.dev.cmake", "--libType", "dynamic", "--config", "debug"]
11092

11193
networks:
11294
nabla.network:
113-
external: true
114-
115-
volumes:
116-
ssh:
117-
external: true
95+
external: true

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
include:
22
- path:
3-
- init/compose.yml
43
- kazoo/compose.yml
54
- cmake/compose.yml
65
- build/compose.yml

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,4 @@ services:
100100

101101
networks:
102102
nabla.network:
103-
external: true
104-
105-
volumes:
106-
ssh:
107-
external: true
103+
external: true

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎docker/dev.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
def parseInputArguments():
55
parser = argparse.ArgumentParser(description="Nabla CI Pipeline compose Framework script")
66

7-
parser.add_argument("--ssh", help="SSH key file used for github authentication, required to clone Nabla", type=str, required=True)
87
parser.add_argument("--platform", help="Target platform", type=str, default="windows")
98
parser.add_argument("--arch", help="Target arch", type=str, default="x86_64")
109

@@ -24,20 +23,16 @@ def main():
2423

2524
root = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../"))
2625

27-
#updateSubmodules(root)
26+
updateSubmodules(root)
2827

2928
os.chdir(os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "compose/ci/stages/dev")))
3029

31-
key = args.ssh
3230
platform = args.platform
3331
arch = args.arch
3432

3533
if subprocess.call(["docker", "network", "inspect", "nabla.network"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
3634
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
3735

38-
if subprocess.call(["docker", "volume", "inspect", "ssh"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
39-
subprocess.run(["docker", "volume", "create", "ssh"], check=True) # create ssh volume if not present
40-
4136
envFile = os.path.abspath(f"../.env/platform/{platform}/.env")
4237

4338
compose = [
@@ -48,7 +43,6 @@ def main():
4843

4944
subprocess.run(compose + ["build"], check=True)
5045
subprocess.run(compose + ["create", "--force-recreate"], check=True)
51-
subprocess.run(compose + ["cp", key, "nabla.init:key"], check=True)
5246
subprocess.run(compose + ["up"], check=True)
5347
subprocess.run(compose + ["down"], check=True)
5448

‎docker/scripts/nbl/ci/dev/init.py‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)