Skip to content

Commit 1c6c0aa

Browse files
committed
move dds_updater to different folder
1 parent d95d4ca commit 1c6c0aa

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM python:3
22

33
RUN mkdir /dds
4-
COPY ./dds/cyclonedds.xml /dds
4+
COPY ./dds_updater/dds/cyclonedds.xml /dds
55
WORKDIR /usr/src/app
66

7-
COPY requirements.txt ./
7+
COPY ./dds_updater/requirements.txt ./
88
RUN pip install --no-cache-dir -r requirements.txt
99

10-
COPY ./dds_xml_updater.py .
10+
COPY ./dds_updater//dds_xml_updater.py .
1111

1212
CMD [ "python", "./dds_xml_updater.py" ]

eg8/dev1/dds_updater/dds/cyclonedds.xml renamed to eg8/dds_updater/dds/cyclonedds.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</General>
1111
<Discovery>
1212
<Peers>
13+
<Peer address="fc94:306a:c554:28fd:f868:7f2a:6537:8a13"></Peer>
1314
<Peer address="fc94:5587:cf8a:7fbd:316d:dee0:5a33:9f51"></Peer>
1415
<Peer address="fc94:5587:cf8a:7fbd:316d:dee0:5a33:9f51"></Peer>
15-
<Peer address="fc94:93ea:bd45:a16b:49cb:7776:34fd:0729"></Peer>
1616
</Peers>
1717
<ParticipantIndex>auto</ParticipantIndex>
1818
</Discovery>

eg8/dev1/docker-compose.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ version: '2.3'
22

33
services:
44
dds_updater:
5-
build: dds_updater/.
5+
build:
6+
context: ../
7+
dockerfile: dds_updater/Dockerfile
68
volumes:
7-
- ./dds_updater/dds:/dds
9+
- ../dds_updater/dds:/dds
810
network_mode: service:husarnet
911
stdin_open: true # docker run -i
1012
tty: true # docker run -t
@@ -14,7 +16,7 @@ services:
1416
context: ../../
1517
dockerfile: eg8/dev1/turtle_controller/Dockerfile
1618
volumes:
17-
- ./dds_updater/dds:/dds
19+
- ../dds_updater/dds:/dds
1820
command:
1921
- bash
2022
- -c
@@ -29,7 +31,7 @@ services:
2931
context: ../../
3032
dockerfile: eg8/dev1/turtle_controller/Dockerfile
3133
volumes:
32-
- ./dds_updater/dds:/dds
34+
- ../dds_updater/dds:/dds
3335
command:
3436
- bash
3537
- -c

eg8/dev2/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ services:
2828
- /dev/net/tun
2929
env_file:
3030
- ./.env # create .env file in the same folder as Dockerfile and specify HOSTNAME and JOINCODE there
31-
network_mode: service:turtle_sim # This is the most important line in this setup. This will put the Husarnet Client in the same network namespace as your app (in this example: turtle_sim)
31+
network_mode: service:turtle_sim # This is the most important line in this setup. This will put the Husarnet Client in the same network namespace as your app (in this example: turtle_sim)

0 commit comments

Comments
 (0)