From 83d8548ce2618f60d08bfb5692ac7670e10113a3 Mon Sep 17 00:00:00 2001
From: Konstantin Yaroshovets <konstantin.yaroshovets@odysseusinc.com>
Date: Fri, 19 Jan 2024 13:15:08 +0100
Subject: [PATCH] Fixes #33 and comments in #29

---
 install/docker/README.md                              |  2 +-
 install/docker/{datanode-example.env => datanode.env} |  4 ++--
 install/docker/docker-compose-windows.yml             | 10 +++++-----
 install/docker/docker-compose.yml                     |  4 ++--
 install/docker/install.ps1                            |  6 +++---
 install/docker/install.sh                             |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename install/docker/{datanode-example.env => datanode.env} (96%)

diff --git a/install/docker/README.md b/install/docker/README.md
index 932a9d96..43a5585b 100644
--- a/install/docker/README.md
+++ b/install/docker/README.md
@@ -24,7 +24,7 @@ Set-ExecutionPolicy -ExecutionPolicy ByPass -Scope CurrentUser
 ```commandline
 .\install.ps1
 ```
-6. Open browser and navigate to `http://localhost:81`
+6. Open browser and navigate to `http://localhost:8080`
 7. The default credentials are:
 - Username: admin
 - Password: ohdsi
diff --git a/install/docker/datanode-example.env b/install/docker/datanode.env
similarity index 96%
rename from install/docker/datanode-example.env
rename to install/docker/datanode.env
index 78fcaccc..d36d3fd7 100644
--- a/install/docker/datanode-example.env
+++ b/install/docker/datanode.env
@@ -1,5 +1,5 @@
-datanode.baseURL=http://host.docker.internal
-datanode.port=81
+datanode.baseURL=http://arachne-datanode
+datanode.port=8080
 server.ssl.enabled=false
 
 executionEngine.protocol=https
diff --git a/install/docker/docker-compose-windows.yml b/install/docker/docker-compose-windows.yml
index 36f17540..318aafc8 100644
--- a/install/docker/docker-compose-windows.yml
+++ b/install/docker/docker-compose-windows.yml
@@ -32,12 +32,12 @@ services:
     ports:
       - "8888:8888"  # Port mapping (host:container)
     volumes:
-      - $USERPROFILE/ArachneDatanode/dist:/dist
+      - $USERPROFILE/ArachneDatanode/runtimes:/runtimes
       - $USERPROFILE/ArachneDatanode/execution-engine/tmp:/tmp
 
     environment:
-      - RUNTIMESERVICE_DIST_ARCHIVE=/dist/r_base_focal_amd64.tar.gz
-      - RUNTIMESERVICE_DIST_ARCHIVEFOLDER=/dist/
+      - RUNTIMESERVICE_DIST_ARCHIVE=/runtimes/r_base_focal_amd64.tar.gz
+      - RUNTIMESERVICE_DIST_ARCHIVEFOLDER=/runtimes/
       - RUNTIMESERVICE_DIST_VERBOSE_LOG=true
       - docker.enable=false
       - applyRuntimeDependenciesComparisonLogic=true
@@ -51,11 +51,11 @@ services:
     networks:
       - arachne-network
     ports:
-      - "81:8080" # Port mapping (host:container)
+      - "8080:8080" # Port mapping (host:container)
     volumes:
       - arachne-datanode-files:/var/arachne/files  # Volume mount for Arachne data
     env_file:
-      - $USERPROFILE/ArachneDatanode/conf/datanode-windows.env  # Environment variables file
+      - $USERPROFILE/ArachneDatanode/conf/datanode.env  # Environment variables file
     depends_on:
       - arachne-datanode-postgres
       - arachne-execution-engine
diff --git a/install/docker/docker-compose.yml b/install/docker/docker-compose.yml
index 63947252..23eb229e 100644
--- a/install/docker/docker-compose.yml
+++ b/install/docker/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       - /tmp:/tmp
       - /var/run/docker.sock:/var/run/docker.sock
       - /tmp/executions:/etc/executions
-      - ~/ArachneDatanode:/dist
+      - ~/ArachneDatanode:/runtimes
     environment:
       - RUNTIMESERVICE_DIST_VERBOSE_LOG=true
       - applyRuntimeDependenciesComparisonLogic=true
@@ -43,7 +43,7 @@ services:
       - DOCKER_IMAGE_DEFAULT=odysseusinc/r-hades:latest
       - ANALYSIS_MOUNT=/tmp/executions
       - DOCKER_ENABLE=true
-      - RUNTIMESERVICE_DIST_ARCHIVEFOLDER=/dist/
+      - RUNTIMESERVICE_DIST_ARCHIVEFOLDER=/runtimes/
 
   # Arachne Datanode Service
   arachne-datanode:
diff --git a/install/docker/install.ps1 b/install/docker/install.ps1
index 28e7eb07..c1aa385e 100644
--- a/install/docker/install.ps1
+++ b/install/docker/install.ps1
@@ -85,7 +85,7 @@ try {
     }
 
     # Create ArachneDatanode Folder if not exists
-    $datanodeFolderPathDist = Join-Path $env:USERPROFILE "ArachneDatanode\dist"
+    $datanodeFolderPathDist = Join-Path $env:USERPROFILE "ArachneDatanode\runtimes"
     if (-not (Test-Path $datanodeFolderPathDist -PathType Container)) {
         New-Item -ItemType Directory -Path $datanodeFolderPathDist
         Write-Host "Created ArachneDatanode R-Package folder."
@@ -122,8 +122,8 @@ try {
     }
     $fileInfo_conf = @{
         envfile = @{
-            fileName = "datanode-windows.env"
-            url = "https://storage.googleapis.com/arachne-datanode/datanode.env"
+            fileName = "datanode.env"
+            url = "https://raw.githubusercontent.com/OHDSI/Arachne/master/install/docker/datanode.env"
             sizeThresholdMB = 0.01
         }
     }
diff --git a/install/docker/install.sh b/install/docker/install.sh
index d8711c86..b7c29f58 100644
--- a/install/docker/install.sh
+++ b/install/docker/install.sh
@@ -15,7 +15,7 @@ for folder in "${folders[@]}"; do
 done
 
 
-cp datanode-example.env ~/ArachneDatanode/datanode.env
+cp datanode.env ~/ArachneDatanode/datanode.env
 cd ~/ArachneDatanode
 wget https://storage.googleapis.com/arachne-datanode/descriptor_base.json