From a6aeba0a2400ee98e2910951eca726c606416279 Mon Sep 17 00:00:00 2001 From: Abdel-Kader Chabi-Sika-Boni Date: Wed, 30 Dec 2020 23:51:47 +0100 Subject: [PATCH] mise a jour --- .../forContainerNet/{gatewayI => gatewayf}/Dockerfile | 10 +++++++++- .../forContainerNet/{gatewayF => gatewayi}/Dockerfile | 10 +++++++++- Dockerfiles/forContainerNet/server/Dockerfile | 7 ++++++- 3 files changed, 24 insertions(+), 3 deletions(-) rename Dockerfiles/forContainerNet/{gatewayI => gatewayf}/Dockerfile (52%) rename Dockerfiles/forContainerNet/{gatewayF => gatewayi}/Dockerfile (52%) diff --git a/Dockerfiles/forContainerNet/gatewayI/Dockerfile b/Dockerfiles/forContainerNet/gatewayf/Dockerfile similarity index 52% rename from Dockerfiles/forContainerNet/gatewayI/Dockerfile rename to Dockerfiles/forContainerNet/gatewayf/Dockerfile index 4801453..850e08e 100644 --- a/Dockerfiles/forContainerNet/gatewayI/Dockerfile +++ b/Dockerfiles/forContainerNet/gatewayf/Dockerfile @@ -1,6 +1,14 @@ # Choosing the image to use FROM node:buster +# Defining variables to allow flexibility (each variable can be set while building through the parameter --build-arg =) +ARG local_ip=127.0.0.1 +ARG local_port=8282 +ARG local_name=gwf1 +ARG remote_ip=127.0.0.1 +ARG remote_port=8181 +ARG remote_name=gwi + # Installing required libraries RUN apt-get update && \ apt-get install -y net-tools iputils-ping && \ @@ -12,7 +20,7 @@ RUN apt-get update && \ npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/gateway.js -ENV LAUNCHER "node /mydir/gateway.js --local_ip '127.0.0.1' --local_port 8181 --local_name 'gwi' --remote_ip '127.0.0.1' --remote_port 8080 --remote_name 'srv'" +ENV LAUNCHER "node /mydir/gateway.js --local_ip '$local_ip' --local_port $local_port --local_name '$local_name' --remote_ip '$remote_ip' --remote_port $remote_port --remote_name '$remote_name'" ENV VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown" diff --git a/Dockerfiles/forContainerNet/gatewayF/Dockerfile b/Dockerfiles/forContainerNet/gatewayi/Dockerfile similarity index 52% rename from Dockerfiles/forContainerNet/gatewayF/Dockerfile rename to Dockerfiles/forContainerNet/gatewayi/Dockerfile index 01f4c41..71e01f9 100644 --- a/Dockerfiles/forContainerNet/gatewayF/Dockerfile +++ b/Dockerfiles/forContainerNet/gatewayi/Dockerfile @@ -1,6 +1,14 @@ # Choosing the image to use FROM node:buster +# Defining variables to allow flexibility (each variable can be set while building through the parameter --build-arg =) +ARG local_ip=127.0.0.1 +ARG local_port=8181 +ARG local_name=gwi +ARG remote_ip=127.0.0.1 +ARG remote_port=8080 +ARG remote_name=srv + # Installing required libraries RUN apt-get update && \ apt-get install -y net-tools iputils-ping && \ @@ -12,7 +20,7 @@ RUN apt-get update && \ npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/gateway.js -ENV LAUNCHER "node /mydir/gateway.js --local_ip '127.0.0.1' --local_port 8282 --local_name 'gwf1' --remote_ip '127.0.0.1' --remote_port 8181 --remote_name 'gwi'" +ENV LAUNCHER "node /mydir/gateway.js --local_ip '$local_ip' --local_port $local_port --local_name '$local_name' --remote_ip '$remote_ip' --remote_port $remote_port --remote_name '$remote_name'" ENV VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown" diff --git a/Dockerfiles/forContainerNet/server/Dockerfile b/Dockerfiles/forContainerNet/server/Dockerfile index 0adac20..29dcd31 100644 --- a/Dockerfiles/forContainerNet/server/Dockerfile +++ b/Dockerfiles/forContainerNet/server/Dockerfile @@ -1,6 +1,11 @@ # Choosing the image to use FROM node:buster +# Defining variables to allow flexibility (each variable can be set while building through the parameter --build-arg =) +ARG local_ip=127.0.0.1 +ARG local_port=8080 +ARG local_name=srv + # Installing required libraries RUN apt-get update && \ apt-get install -y net-tools iputils-ping && \ @@ -12,7 +17,7 @@ RUN apt-get update && \ npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/server.js -ENV LAUNCHER "node /mydir/server.js --local_ip '127.0.0.1' --local_port '8080' --local_name 'srv'" +ENV LAUNCHER "node /mydir/server.js --local_ip '$local_ip' --local_port '$local_port' --local_name '$local_name'" ENV VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown"