From 6060e2fa1c277f3bfed34dc719917b9dbc69dbb4 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 25 Jan 2021 12:18:45 -0800 Subject: [PATCH] Fixing for docker --- docker_build.sh | 6 +++--- docker_config_manager.sh | 1 - docker_config_monitor.sh | 1 - docker_config_node.sh | 1 - docker_run_manager.sh | 4 ++-- docker_run_monitor.sh | 4 ++-- docker_run_node.sh | 4 ++-- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docker_build.sh b/docker_build.sh index 72e0a82..b4bf585 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -1,3 +1,3 @@ -docker build --no-cache --tag tip-owls-manager -f Dockerfile-manager -docker build --no-cache --tag tip-owls-node -f Dockerfile-node -docker build --no-cache --tag tip-owls-monitor -f Dockerfile-monitor +docker build --no-cache --tag tip-owls-manager --file Dockerfile-manager . +docker build --no-cache --tag tip-owls-node --file Dockerfile-node . +docker build --no-cache --tag tip-owls-monitor --file Dockerfile-monitor . diff --git a/docker_config_manager.sh b/docker_config_manager.sh index 687ad96..cffa259 100755 --- a/docker_config_manager.sh +++ b/docker_config_manager.sh @@ -1,7 +1,6 @@ #!/bin/sh # This file is used from within the docker build script to copy the proper configurations for the manager - cp priv/templates/simmanager.config.template.docker config/sys.config cp priv/templates/simmanager.args.template.docker config/vm.args diff --git a/docker_config_monitor.sh b/docker_config_monitor.sh index d9d3a5b..1a1dcd1 100755 --- a/docker_config_monitor.sh +++ b/docker_config_monitor.sh @@ -1,7 +1,6 @@ #!/bin/sh # This file is used from within the docker build script to copy the proper configurations for the manager - cp priv/templates/simmonitor.config.template.docker config/sys.config cp priv/templates/simmonitor.args.template.docker config/vm.args diff --git a/docker_config_node.sh b/docker_config_node.sh index 25714b9..3015d6b 100755 --- a/docker_config_node.sh +++ b/docker_config_node.sh @@ -1,7 +1,6 @@ #!/bin/sh # This file is used from within the docker build script to copy the proper configurations for the manager - cp priv/templates/simnode.config.template.docker config/sys.config cp priv/templates/simnode.args.template.docker config/vm.args diff --git a/docker_run_manager.sh b/docker_run_manager.sh index 05db550..2bba94e 100755 --- a/docker_run_manager.sh +++ b/docker_run_manager.sh @@ -1,3 +1,3 @@ -mkdir docker_logs +mkdir docker_logs_manager # docker run -it -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs:/app_data/logs" -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-1 -docker run -d -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs:/app_data/logs" -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-manager \ No newline at end of file +docker run -it -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs_manager:/app_data/logs" --network=owls -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-manager \ No newline at end of file diff --git a/docker_run_monitor.sh b/docker_run_monitor.sh index cf6a54d..f991dde 100755 --- a/docker_run_monitor.sh +++ b/docker_run_monitor.sh @@ -1,3 +1,3 @@ -mkdir docker_logs +mkdir docker_logs_monitor # docker run -it -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs:/app_data/logs" -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-1 -docker run -d -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs:/app_data/logs" -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-monitor \ No newline at end of file +docker run -d --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs_monitor:/app_data/logs" --network=owls -e ERL_NODE_NAME="monitor1@renegademac.arilia.com" tip-owls-monitor \ No newline at end of file diff --git a/docker_run_node.sh b/docker_run_node.sh index a25b9ab..1a1cc10 100755 --- a/docker_run_node.sh +++ b/docker_run_node.sh @@ -1,3 +1,3 @@ -mkdir docker_logs +mkdir docker_logs_node1 # docker run -it -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs:/app_data/logs" -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-1 -docker run -d -p 9091:9090 --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs:/app_data/logs" -e ERL_NODE_NAME="simmanager1@renegademac.arilia.com" tip-owls-node \ No newline at end of file +docker run -d --init --volume="$PWD/ssl:/etc/ssl/certs" --volume="$PWD/docker_logs_node1:/app_data/logs" --network=owls -e ERL_NODE_NAME="node1@renegademac.arilia.com" tip-owls-node \ No newline at end of file