From 80158d515fea2c07b1efdfb4a1c8f019be5d7499 Mon Sep 17 00:00:00 2001 From: chabisik Date: Wed, 30 Dec 2020 21:24:46 +0100 Subject: [PATCH] mise a jour --- Dockerfiles/forContainerNet/device/Dockerfile | 21 ++++++++--------- .../forContainerNet/gatewayF/Dockerfile | 22 ++++++++---------- .../forContainerNet/gatewayI/Dockerfile | 20 ++++++++-------- Dockerfiles/forContainerNet/server/Dockerfile | 23 ++++++++++--------- .../{server_buster => server_exp}/Dockerfile | 0 .../Dockerfile | 0 6 files changed, 42 insertions(+), 44 deletions(-) rename Dockerfiles/forContainerNet/{server_buster => server_exp}/Dockerfile (100%) rename Dockerfiles/forContainerNet/{server_buster2 => server_exp2}/Dockerfile (100%) diff --git a/Dockerfiles/forContainerNet/device/Dockerfile b/Dockerfiles/forContainerNet/device/Dockerfile index a31ded2..3c7bc28 100644 --- a/Dockerfiles/forContainerNet/device/Dockerfile +++ b/Dockerfiles/forContainerNet/device/Dockerfile @@ -1,23 +1,22 @@ # Choosing the image to use -FROM node:alpine +FROM node:buster # Installing required libraries -RUN apk add npm && \ - apk add bash && \ - mkdir device && \ - cd device && \ +RUN apt-get update && \ + apt-get install -y net-tools iputils-ping && \ + mkdir mydir && \ + cd mydir && \ npm install express && \ npm install yargs && \ npm install systeminformation && \ npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/device.js -# set entry point for emulator gatekeeper (needed for compatibility with vim-emu datacenters) -#ENV VIM_EMU_CMD "node /device/device.js --local_ip "127.0.0.1" --local_port 9001 --local_name "dev1" --remote_ip "127.0.0.1" --remote_port 8282 --remote_name "gwf1" --send_period 3000" #uncomment when on ContainerNet datacenter -#ENV VIM_EMU_CMD "TODO at startup" +ENV LAUNCHER "node /mydir/device.js --local_ip '127.0.0.1' --local_port 9001 --local_name 'dev1' --remote_ip '127.0.0.1' --remote_port 8282 --remote_name 'gwf1' --send_period 3000" + +ENV VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown" -# CMD should always point to /bin/bash to not block the emulator (sh for node:alpine) -CMD node /device/device.js --local_ip "127.0.0.1" --local_port 9001 --local_name "dev1" --remote_ip "127.0.0.1" --remote_port 8282 --remote_name "gwf1" --send_period 3000 #comment when on ContainerNet datacenter -#CMD /bin/bash #uncomment when on ContainerNet datacenter +# Mandatory entrypoint in containernet +CMD /bin/bash diff --git a/Dockerfiles/forContainerNet/gatewayF/Dockerfile b/Dockerfiles/forContainerNet/gatewayF/Dockerfile index 86037f3..01f4c41 100644 --- a/Dockerfiles/forContainerNet/gatewayF/Dockerfile +++ b/Dockerfiles/forContainerNet/gatewayF/Dockerfile @@ -1,24 +1,22 @@ # Choosing the image to use -FROM node:alpine +FROM node:buster # Installing required libraries -RUN apk add npm && \ - mkdir gateway && \ - cd gateway && \ +RUN apt-get update && \ + apt-get install -y net-tools iputils-ping && \ + mkdir mydir && \ + cd mydir && \ npm install express && \ npm install yargs && \ npm install systeminformation && \ npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/gateway.js -# set entry point for emulator gatekeeper (needed for compatibility with vim-emu datacenters) -#ENV VIM_EMU_CMD "node /gateway/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" - #uncomment when on ContainerNet datacenter -#ENV VIM_EMU_CMD "TODO at startup" +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 VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown" -# CMD should always point to /bin/bash to not block the emulator (sh for node:alpine) -CMD node /gateway/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" - #comment when on ContainerNet datacenter -#CMD /bin/sh #uncomment when on ContainerNet datacenter +# Mandatory entrypoint in containernet +CMD /bin/bash diff --git a/Dockerfiles/forContainerNet/gatewayI/Dockerfile b/Dockerfiles/forContainerNet/gatewayI/Dockerfile index cd657ff..4801453 100644 --- a/Dockerfiles/forContainerNet/gatewayI/Dockerfile +++ b/Dockerfiles/forContainerNet/gatewayI/Dockerfile @@ -1,22 +1,22 @@ # Choosing the image to use -FROM node:alpine +FROM node:buster # Installing required libraries -RUN apk add npm && \ - mkdir gateway && \ - cd gateway && \ +RUN apt-get update && \ + apt-get install -y net-tools iputils-ping && \ + mkdir mydir && \ + cd mydir && \ npm install express && \ npm install yargs && \ npm install systeminformation && \ npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/gateway.js -# set entry point for emulator gatekeeper (needed for compatibility with vim-emu datacenters) -#ENV VIM_EMU_CMD "node /gateway/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" #uncomment when on ContainerNet datacenter -#ENV VIM_EMU_CMD "TODO at startup" +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 VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown" -# CMD should always point to /bin/bash to not block the emulator (sh for node:alpine) -CMD node /gateway/gateway.js --local_ip "172.17.0.4" --local_port 8181 --local_name "gwi" --remote_ip "172.17.0.2" --remote_port 8080 --remote_name "srv" #comment when on ContainerNet datacenter -#CMD /bin/sh #uncomment when on ContainerNet datacenter +# Mandatory entrypoint in containernet +CMD /bin/bash diff --git a/Dockerfiles/forContainerNet/server/Dockerfile b/Dockerfiles/forContainerNet/server/Dockerfile index 6d66145..0adac20 100644 --- a/Dockerfiles/forContainerNet/server/Dockerfile +++ b/Dockerfiles/forContainerNet/server/Dockerfile @@ -1,21 +1,22 @@ # Choosing the image to use -FROM node:alpine +FROM node:buster # Installing required libraries -RUN apk add npm && \ - apk add bash && \ - mkdir server && \ - cd server && \ +RUN apt-get update && \ + apt-get install -y net-tools iputils-ping && \ + mkdir mydir && \ + cd mydir && \ npm install express && \ npm install yargs && \ npm install systeminformation && \ + npm install request && \ wget http://homepages.laas.fr/smedjiah/tmp/server.js -# set entry point for emulator gatekeeper (needed for compatibility with vim-emu datacenters) -ENV VIM_EMU_CMD "node /server/server.js --local_ip '127.0.0.1' --local_port '8080' --local_name 'srv'" #uncomment when on ContainerNet datacenter -#ENV VIM_EMU_CMD "TODO at startup" +ENV LAUNCHER "node /mydir/server.js --local_ip '127.0.0.1' --local_port '8080' --local_name 'srv'" + +ENV VIM_EMU_CMD "nohup $LAUNCHER &" #ENV VIM_EMU_CMD_STOP "TODO at shutdown" -# CMD should always point to /bin/bash to not block the emulator (sh for node:alpine) -#CMD node /server/server.js --local_ip '127.0.0.1' --local_port '8080' --local_name 'srv' #comment when on ContainerNet datacenter -CMD /bin/bash #uncomment when on ContainerNet datacenter +# Mandatory entrypoint in containernet +CMD /bin/bash + diff --git a/Dockerfiles/forContainerNet/server_buster/Dockerfile b/Dockerfiles/forContainerNet/server_exp/Dockerfile similarity index 100% rename from Dockerfiles/forContainerNet/server_buster/Dockerfile rename to Dockerfiles/forContainerNet/server_exp/Dockerfile diff --git a/Dockerfiles/forContainerNet/server_buster2/Dockerfile b/Dockerfiles/forContainerNet/server_exp2/Dockerfile similarity index 100% rename from Dockerfiles/forContainerNet/server_buster2/Dockerfile rename to Dockerfiles/forContainerNet/server_exp2/Dockerfile