diff --git a/.travis.yml b/.travis.yml index 361ba537e..65b3cbfb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - docker build -t jekkos/opensourcepos . - docker run -d -p 127.0.0.1:80:80 jekkos/opensourcepos /bin/sh -c "cd /app; npm install" - docker ps -a - - docker run jekkos/opensourcepos /bin/sh -c "cd /app; npm mochaWebdriver:test" + - docker run jekkos/opensourcepos /bin/sh -c "cd /app; grunt mochaWebdriver:test" script: - - npm mochaWebdriver:test + - grunt mochaWebdriver:test diff --git a/Dockerfile b/Dockerfile index 43f27e779..70ecb99f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,9 @@ RUN apt-get install -y python git # Get latest Ospos source from Git RUN git clone https://github.com/jekkos/opensourcepos.git /app # RUN cd app && git checkout develop/2.4 +RUN ln -s /usr/bin/nodejs /usr/bin/node RUN cd app && npm install +RUN npm install -g grunt-cli RUN ln -fs /app/* /var/www/html ADD ./docker/start_container.sh /start_container.sh