Commit 0a1e3760 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !5
parents 012b8045 506a25d1
Pipeline #146685 passed with stages
in 1 minute and 48 seconds
......@@ -25,5 +25,8 @@ WORKDIR /app
COPY HardwareEmulator.so ./
COPY rmi-model-server.jar ./rmi-model-server.jar
COPY ./autopilots/ ./autopilots/
COPY ./autopilots/ ./autopilots/AutopilotAdapter
CMD exec java -cp rmi-model-server.jar -Djava.rmi.server.codebase=file:rmi-model-server.jar -Djava.rmi.server.useLocalHostname=true rwth.rmi.model.server.RMIServer 10101 autopilots
CMD exec java -cp rmi-model-server.jar -Djava.rmi.server.codebase=file:rmi-model-server.jar -Djava.rmi.server.hostname=localhost rwth.rmi.model.server.RMIServer 10101 autopilots --no-zookeeper \
no_time os=linux
......@@ -23,5 +23,5 @@
call config.bat
echo Starting RMIModelServer on port %PORT% with Autopilot folder: %AUTOPILOT_FOLDER%
java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.hostname=127.0.0.1" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer %PORT% %AUTOPILOT_FOLDER% --no-zookeeper %*
java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.hostname=localhost" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer %PORT% %AUTOPILOT_FOLDER% --no-zookeeper %*
pause
......@@ -20,8 +20,7 @@
# *******************************************************************************
#
./config.sh
source ./config.sh
echo "Starting RMIModelServer on port $PORT with Autopilot folder: $AUTOPILOT_FOLDER"
java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.hostname=127.0.0.1" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer $PORT $AUTOPILOT_FOLDER --no-zookeeper %*
pause
java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.hostname=localhost" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer $PORT $AUTOPILOT_FOLDER --no-zookeeper
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment