update name resolve conflicts
This commit is contained in:
@@ -1 +1 @@
|
|||||||
docker logs hw1-client
|
docker logs hw0-client
|
||||||
@@ -1 +1 @@
|
|||||||
docker exec -it hw1-client sh
|
docker exec -it hw0-client sh
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: debian:bookworm-slim
|
image: debian:bookworm-slim
|
||||||
container_name: hw1-server
|
container_name: hw0-server
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
networks:
|
networks:
|
||||||
net-hw1:
|
net-hw0:
|
||||||
ipv4_address: ${SERVER_IP}
|
ipv4_address: ${SERVER_IP}
|
||||||
volumes:
|
volumes:
|
||||||
- ./bin/server:/usr/local/bin/server:ro
|
- ./bin/server:/usr/local/bin/server:ro
|
||||||
@@ -14,12 +14,12 @@ services:
|
|||||||
|
|
||||||
client:
|
client:
|
||||||
image: debian:bookworm-slim
|
image: debian:bookworm-slim
|
||||||
container_name: hw1-client
|
container_name: hw0-client
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
networks:
|
networks:
|
||||||
net-hw1:
|
net-hw0:
|
||||||
ipv4_address: ${CLIENT_IP}
|
ipv4_address: ${CLIENT_IP}
|
||||||
depends_on:
|
depends_on:
|
||||||
- server
|
- server
|
||||||
@@ -30,8 +30,8 @@ services:
|
|||||||
entrypoint: ["bash", "-lc", "apt-get update && apt-get install -y --no-install-recommends libstdc++6 iproute2; exec stdbuf -oL -eL /usr/local/bin/client"]
|
entrypoint: ["bash", "-lc", "apt-get update && apt-get install -y --no-install-recommends libstdc++6 iproute2; exec stdbuf -oL -eL /usr/local/bin/client"]
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
net-hw1:
|
net-hw0:
|
||||||
name: net-hw1
|
name: net-hw0
|
||||||
driver: bridge
|
driver: bridge
|
||||||
ipam:
|
ipam:
|
||||||
config:
|
config:
|
||||||
|
|||||||
Binary file not shown.
@@ -396,12 +396,12 @@ int main(void){
|
|||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: debian:bookworm-slim
|
image: debian:bookworm-slim
|
||||||
container_name: hw1-server
|
container_name: hw0-server
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
networks:
|
networks:
|
||||||
net-hw1:
|
net-hw0:
|
||||||
ipv4_address: ${SERVER_IP}
|
ipv4_address: ${SERVER_IP}
|
||||||
volumes:
|
volumes:
|
||||||
- ./bin/server:/usr/local/bin/server:ro
|
- ./bin/server:/usr/local/bin/server:ro
|
||||||
@@ -409,12 +409,12 @@ services:
|
|||||||
|
|
||||||
client:
|
client:
|
||||||
image: debian:bookworm-slim
|
image: debian:bookworm-slim
|
||||||
container_name: hw1-client
|
container_name: hw0-client
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
networks:
|
networks:
|
||||||
net-hw1:
|
net-hw0:
|
||||||
ipv4_address: ${CLIENT_IP}
|
ipv4_address: ${CLIENT_IP}
|
||||||
depends_on:
|
depends_on:
|
||||||
- server
|
- server
|
||||||
@@ -425,8 +425,8 @@ services:
|
|||||||
entrypoint: ["bash", "-lc", "apt-get update && apt-get install -y --no-install-recommends libstdc++6 iproute2; exec stdbuf -oL -eL /usr/local/bin/client"]
|
entrypoint: ["bash", "-lc", "apt-get update && apt-get install -y --no-install-recommends libstdc++6 iproute2; exec stdbuf -oL -eL /usr/local/bin/client"]
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
net-hw1:
|
net-hw0:
|
||||||
name: net-hw1
|
name: net-hw0
|
||||||
driver: bridge
|
driver: bridge
|
||||||
ipam:
|
ipam:
|
||||||
config:
|
config:
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
docker logs hw1-server --tail=50
|
docker logs hw0-server --tail=50
|
||||||
Reference in New Issue
Block a user