From cfbb700f0cd2518905a88d56b4836546a5bcec45 Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 22 Jan 2016 13:10:23 +0100 Subject: [PATCH 1/3] Add symlink for node in Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 43f27e779..d80d06ed0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ 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 ln -fs /app/* /var/www/html From bcbdee3a50c6edb5e3114ef6d7b727e7e9678c14 Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 22 Jan 2016 13:37:30 +0100 Subject: [PATCH 2/3] Fix test execution for travis-ci (grunt invocation) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 1148ef15958de5e098a74eea27a97c97838d79a9 Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 22 Jan 2016 14:43:53 +0100 Subject: [PATCH 3/3] Install grunt-cli in docker container (#284) --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d80d06ed0..70ecb99f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ 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