Reverted some changes, added data volume for node_modules dir

pull/29/head
Piero Toffanin 2016-10-05 16:31:46 -04:00
rodzic f50c9219d9
commit 0c3f589b1f
3 zmienionych plików z 4 dodań i 8 usunięć

Wyświetl plik

@ -27,7 +27,7 @@ RUN curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get install -y nodejs
WORKDIR /webodm/nodeodm/external/node-OpenDroneMap
RUN npm install -g
RUN npm install
WORKDIR /webodm

Wyświetl plik

@ -11,6 +11,7 @@ services:
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /webodm/wait-for-it.sh db:5432 -- /webodm/start.sh"
volumes:
- .:/webodm
- /webodm/nodeodm/external/node-OpenDroneMap/node_modules
ports:
- "8000:8000"
depends_on:

Wyświetl plik

@ -1,7 +1,7 @@
from django.test import TestCase
from django.utils import six
import subprocess, time
from os import path, environ
from os import path
from .models import ProcessingNode
from .api_client import ApiClient
@ -14,12 +14,7 @@ class TestClientApi(TestCase):
@classmethod
def setUpClass(cls):
super(TestClientApi, cls).setUpClass()
node_odm_dir = path.join(current_dir, "external", "node-OpenDroneMap")
cls.node_odm = subprocess.Popen(['node', 'index.js', '--port', '11223', '--test'],
shell=False,
cwd=node_odm_dir,
env=dict(environ, NODE_PATH=path.join(node_odm_dir, "node_modules")))
cls.node_odm = subprocess.Popen(['node', 'index.js', '--port', '11223', '--test'], shell=False, cwd=path.join(current_dir, "external", "node-OpenDroneMap"))
time.sleep(5) # Wait for the server to launch