Merge pull request #1 from georgemjohnson11/containerize-orchestratio…

…n-neptune

Update compose and environment vars

Dockerfile

@@ -64,7 +64,7 @@ RUN curl -sL --location https://deb.nodesource.com/setup_15.x | bash -
 RUN apt-get -y install nodejs
 
 # Pyenv for our baseline python environment for poetry later on.
-RUN git clone git://github.com/yyuu/pyenv.git .pyenv
+RUN git clone https://github.com/yyuu/pyenv.git .pyenv
 RUN git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
 
 ENV HOME  /
@@ -117,8 +117,3 @@ ADD start.sh .
 EXPOSE 3000
 EXPOSE 8080
 CMD ["sh", "start.sh"]
-
-
-
-
-

Fluigi-Cloud/.env

@@ -1,8 +1,8 @@
-NEPTUNE_MONGOURL="mongodb://root:rootpassword@localhost:27017/?authMechanism=DEFAULT"
+NEPTUNE_MONGOURL="mongodb://root:rootpassword@backend_database:27017"
 NEPTUNE_SESSIONSECRET="randomsecret"
-NEPTUNE_AWS_URL="localhost:9000"
+NEPTUNE_AWS_URL="s3local:9000"
 NEPTUNE_AWSID=""
 NEPTUNE_AWSKEY=""
 NEPTUNE_S3_BUCKET_ID=""
-NEPTUNE_REDIS_HOST="localhost"
-NEPTUNE_REDIS_PORT="6379"
+NEPTUNE_REDIS_HOST="broker"
+NEPTUNE_REDIS_PORT="6379"

docker-compose.yml

@@ -1,6 +1,21 @@
 version: "3"
 services:
 
+    neptune:
+      build: 
+        context: .
+      ports:
+        - 8080:8080
+        - 3000:3000
+      links:
+        - "backend_database"
+      depends_on:
+        - "s3local"
+        - "broker"
+        - "primitives-server"
+        - "worker"
+        - "backend_database"
+
     s3local:
       image: minio/minio
       ports:

setup.sh

@@ -4,15 +4,15 @@ git submodule update --recursive
 cd ./Fluigi-Cloud
 git fetch origin dev
 git checkout dev
-npm install
+npm install --legacy-peer-deps
 sudo chown -R $USER:$GROUP jobs/
 
 cd ..
 
 cd ./Neptune-UI
 git fetch origin dev
 git checkout origin dev
-npm install
+npm install --legacy-peer-deps
 npm run build
 
 cp -vr ./dist ../Fluigi-Cloud/dist