cleanup

dockers -> docker Former-commit-id: ba64807
EpistasisLab · May 5, 2020 · 28645dc · 28645dc
1 parent 66f711d
commit 28645dc
Show file tree

Hide file tree

Showing 32 changed files with 45 additions and 133 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,9 +1,9 @@
 # Allow files and directories
 !**/package.json
 !**/package-lock.json
-!/dockers/dbmongo/files/**
-!/dockers/lab/files/**
-!/dockers/machine/files/**
+!/docker/dbmongo/files/**
+!/docker/lab/files/**
+!/docker/machine/files/**
 
 # Ignore unnecessary files inside allowed directories
 # This should go after the allowed directories

diff --git a/config/readme.md b/config/readme.md
@@ -1,7 +1,7 @@
 # Environment Configuration
 
 # Algorithm Configuration
-Machine learning algorithm parameters and UI settings are defined in `/dockers/dbmongo/files/projects.json`
+Machine learning algorithm parameters and UI settings are defined in `/docker/dbmongo/files/projects.json`
 
 ## Schema
 ```

diff --git a/data/knowledgebases/processing/preprocess_pmlb_knowledgebase.ipynb b/data/knowledgebases/processing/preprocess_pmlb_knowledgebase.ipynb
@@ -117,7 +117,7 @@
     "from json import JSONDecoder                                                         \n",
     "from functools import partial                                                        \n",
     "                                                                         \n",
-    "alldata= json.load(open('../../../dockers/dbmongo/files/projects.json'),encoding=\"utf-8\")\n",
+    "alldata= json.load(open('../../../docker/dbmongo/files/projects.json'),encoding=\"utf-8\")\n",
     "\n",
     "# path = 'projects_newlines.json'                                \n",
     "# data,alldata=[],[]                                                                   \n",

diff --git a/docker-compose-int-test.yml b/docker-compose-int-test.yml
@@ -21,7 +21,7 @@ services:
   lab:
     build:
       context: .
-      dockerfile: dockers/lab/Dockerfile
+      dockerfile: docker/lab/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -43,7 +43,7 @@ services:
   machine:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -62,7 +62,7 @@ services:
   dbmongo:
     build:
       context: .
-      dockerfile: dockers/dbmongo/Dockerfile
+      dockerfile: docker/dbmongo/Dockerfile
     tty: true
     stdin_open: true
     ports:

diff --git a/docker-compose-multi-machine.yml b/docker-compose-multi-machine.yml
@@ -4,7 +4,7 @@ services:
   lab:
     build:
       context: .
-      dockerfile: dockers/lab/Dockerfile
+      dockerfile: docker/lab/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -23,7 +23,7 @@ services:
   machine_1:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -42,7 +42,7 @@ services:
   machine_2:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -61,7 +61,7 @@ services:
   machine_3:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -80,7 +80,7 @@ services:
   machine_4:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -98,7 +98,7 @@ services:
   machine_5:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -117,7 +117,7 @@ services:
   machine_6:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -136,7 +136,7 @@ services:
   dbmongo:
     build:
       context: .
-      dockerfile: dockers/dbmongo/Dockerfile
+      dockerfile: docker/dbmongo/Dockerfile
     tty: true
     stdin_open: true
     ports:

diff --git a/docker-compose-production.yml b/docker-compose-production.yml
@@ -5,7 +5,7 @@ services:
   lab:
     build:
       context: .
-      dockerfile: dockers/lab/Dockerfile_production
+      dockerfile: docker/lab/Dockerfile_production
     image: "pennai_lab:${TAG}"
     tty: true
     stdin_open: true
@@ -24,7 +24,7 @@ services:
   machine:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile_production
+      dockerfile: docker/machine/Dockerfile_production
     image: "pennai_machine:${TAG}"
     tty: true
     stdin_open: true
@@ -43,7 +43,7 @@ services:
   dbmongo:
     build:
       context: .
-      dockerfile: dockers/dbmongo/Dockerfile
+      dockerfile: docker/dbmongo/Dockerfile
     image: "pennai_dbmongo:${TAG}"
     tty: true
     stdin_open: true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   lab:
     build:
       context: .
-      dockerfile: dockers/lab/Dockerfile
+      dockerfile: docker/lab/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -22,7 +22,7 @@ services:
   machine:
     build:
       context: .
-      dockerfile: dockers/machine/Dockerfile
+      dockerfile: docker/machine/Dockerfile
     tty: true
     stdin_open: true
     volumes:
@@ -40,7 +40,7 @@ services:
   dbmongo:
     build:
       context: .
-      dockerfile: dockers/dbmongo/Dockerfile
+      dockerfile: docker/dbmongo/Dockerfile
     tty: true
     stdin_open: true
     ports:

diff --git a/dockers/dbmongo/Dockerfile → docker/dbmongo/Dockerfile b/dockers/dbmongo/Dockerfile → docker/dbmongo/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:xenial
 WORKDIR /opt/
 
-ARG docker_filepath=dockers/dbmongo/files
+ARG docker_filepath=docker/dbmongo/files
 
 #add repo for mongodb
 RUN echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list

diff --git a/dockers/dbmongo/files/entrypoint.sh → docker/dbmongo/files/entrypoint.sh b/dockers/dbmongo/files/entrypoint.sh → docker/dbmongo/files/entrypoint.sh
diff --git a/dockers/dbmongo/files/mongod.conf → docker/dbmongo/files/mongod.conf b/dockers/dbmongo/files/mongod.conf → docker/dbmongo/files/mongod.conf
diff --git a/dockers/dbmongo/files/projects.json → docker/dbmongo/files/projects.json b/dockers/dbmongo/files/projects.json → docker/dbmongo/files/projects.json
diff --git a/dockers/dbmongo/files/sync.sh → docker/dbmongo/files/sync.sh b/dockers/dbmongo/files/sync.sh → docker/dbmongo/files/sync.sh
diff --git a/dockers/dbmongo/files/users.json → docker/dbmongo/files/users.json b/dockers/dbmongo/files/users.json → docker/dbmongo/files/users.json
diff --git a/dockers/lab/Dockerfile → docker/lab/Dockerfile b/dockers/lab/Dockerfile → docker/lab/Dockerfile
@@ -6,7 +6,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz
     rm ~/node.tar.xz
 ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH
 
-ARG docker_filepath=dockers/lab/files
+ARG docker_filepath=docker/lab/files
 
 RUN apt-get update --fix-missing && apt-get install -y \
     vim openssh-client openssh-server telnet apache2 \

diff --git a/dockers/lab/Dockerfile_production → docker/lab/Dockerfile_production b/dockers/lab/Dockerfile_production → docker/lab/Dockerfile_production
@@ -11,7 +11,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz
     rm ~/node.tar.xz
 ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH
 
-ARG docker_filepath=dockers/lab/files
+ARG docker_filepath=docker/lab/files
 
 RUN apt-get update --fix-missing && apt-get install -y \
     vim openssh-client openssh-server telnet apache2 \

diff --git a/dockers/lab/files/001-pennai.conf → docker/lab/files/001-pennai.conf b/dockers/lab/files/001-pennai.conf → docker/lab/files/001-pennai.conf
diff --git a/dockers/lab/files/ca.crt → docker/lab/files/ca.crt b/dockers/lab/files/ca.crt → docker/lab/files/ca.crt
diff --git a/dockers/lab/files/certs/.gitigore → docker/lab/files/certs/.gitigore b/dockers/lab/files/certs/.gitigore → docker/lab/files/certs/.gitigore
diff --git a/dockers/lab/files/entrypoint.sh → docker/lab/files/entrypoint.sh b/dockers/lab/files/entrypoint.sh → docker/lab/files/entrypoint.sh
diff --git a/dockers/lab/files/ports.conf → docker/lab/files/ports.conf b/dockers/lab/files/ports.conf → docker/lab/files/ports.conf
diff --git a/dockers/lab/files/requirements.txt → docker/lab/files/requirements.txt b/dockers/lab/files/requirements.txt → docker/lab/files/requirements.txt
@@ -1,8 +1,8 @@
-scikit-learn==0.22.1
-tqdm==4.32.2
-pymongo==3.8.0
-pandas==1.0.3
-cython==0.29.2
-xgboost==0.82
-simplejson==3.16.0
-requests==2.22.0
+scikit-learn==0.22.1
+tqdm==4.32.2
+pymongo==3.8.0
+pandas==1.0.3
+cython==0.29.2
+xgboost==0.82
+simplejson==3.16.0
+requests==2.22.0
diff --git a/dockers/lab/files/start.sh → docker/lab/files/start.sh b/dockers/lab/files/start.sh → docker/lab/files/start.sh
diff --git a/dockers/lab/files/wait-for-it.sh → docker/lab/files/wait-for-it.sh b/dockers/lab/files/wait-for-it.sh → docker/lab/files/wait-for-it.sh
diff --git a/dockers/machine/Dockerfile → docker/machine/Dockerfile b/dockers/machine/Dockerfile → docker/machine/Dockerfile
@@ -6,7 +6,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz
     rm ~/node.tar.xz
 ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH
 
-ARG docker_filepath=dockers/machine/files
+ARG docker_filepath=docker/machine/files
 
 RUN apt-get update --fix-missing && apt-get install -y \
     vim openssh-client openssh-server graphviz \

diff --git a/dockers/machine/Dockerfile_production → docker/machine/Dockerfile_production b/dockers/machine/Dockerfile_production → docker/machine/Dockerfile_production
@@ -10,7 +10,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz
     rm ~/node.tar.xz
 ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH
 
-ARG docker_filepath=dockers/machine/files
+ARG docker_filepath=docker/machine/files
 
 RUN apt-get update --fix-missing && apt-get install -y \
     vim openssh-client openssh-server graphviz \

diff --git a/dockers/machine/files/entrypoint.sh → docker/machine/files/entrypoint.sh b/dockers/machine/files/entrypoint.sh → docker/machine/files/entrypoint.sh
diff --git a/dockers/machine/files/requirements.txt → docker/machine/files/requirements.txt b/dockers/machine/files/requirements.txt → docker/machine/files/requirements.txt
@@ -1,9 +1,9 @@
-scikit-learn==0.22.1
-tqdm==4.32.2
-pymongo==3.8.0
-pandas==1.0.3
-matplotlib==3.1.0
-mlxtend==0.16.0
-pydot==1.4.1
-requests==2.22.0
-xgboost==0.90
+scikit-learn==0.22.1
+tqdm==4.32.2
+pymongo==3.8.0
+pandas==1.0.3
+matplotlib==3.1.0
+mlxtend==0.16.0
+pydot==1.4.1
+requests==2.22.0
+xgboost==0.90
diff --git a/dockers/machine/files/wait-for-it.sh → docker/machine/files/wait-for-it.sh b/dockers/machine/files/wait-for-it.sh → docker/machine/files/wait-for-it.sh
diff --git a/dockers/lab/files/certs/cert.pem b/dockers/lab/files/certs/cert.pem
diff --git a/dockers/lab/files/certs/key.pem b/dockers/lab/files/certs/key.pem
diff --git a/dockers/lab/files/htpasswd b/dockers/lab/files/htpasswd
diff --git a/machine/test/learn_tests.py b/machine/test/learn_tests.py
@@ -119,7 +119,7 @@ def make_train_test_split(input_data, target_name, random_state):
 test_gbc = GradientBoostingClassifier()
 test_reg = DecisionTreeRegressor()
 # projects information
-projects_json = "dockers/dbmongo/files/projects.json"
+projects_json = "docker/dbmongo/files/projects.json"
 # json_file = open(projects_json, encoding="utf8")
 # projects_json_data = [obj for obj in decode_stacked(json_file.read())]