From 08e329403215304ab686e5375fecf1d07d32a64f Mon Sep 17 00:00:00 2001 From: nabilelmahiri <nabil.elmahiri@fractalite.com> Date: Wed, 13 Mar 2019 17:49:39 +0100 Subject: [PATCH] fix apps folder --- docker/Dockerfile | 7 +++++-- docker/supervisord.conf | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2a22499..b671091 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -79,7 +79,7 @@ RUN cat ~/.ssh/id_rsa WORKDIR /atlasvoyages -COPY ./sh /atlasvoyages/sh +# COPY ./sh /atlasvoyages/sh # RUN login automatiquely to npm # RUN expect -f ./sh/npm_login_expect nabilelmahiri password "nabil.elmahiri@fractalite.com" @@ -91,10 +91,12 @@ RUN sed -i 's/git+ssh:\/\/git@labs.atlasvoyages.com:/git+http:\/\/gitlab-ci-toke RUN npm install --unsafe-perm=true +# hide deploy token +RUN sed -i 's/git+ssh:\/\/git@labs.atlasvoyages.com:/git+http:\/\/gitlab-ci-token:xxxxxxxxx@labs.atlasvoyages.com\//' ./package.json + COPY ./ /atlasvoyages/ RUN chmod -R 700 /atlasvoyages/apps -WORKDIR /atlasvoyages # restore mongo db database # RUN mongorestore --host localhost --port 27017 --gzip --archive=atlasvoyages-dev.archive @@ -108,6 +110,7 @@ RUN echo '\n' | grunt pine:setup RUN grunt pine:copy + # expose port 80 443 EXPOSE 80 EXPOSE 443 diff --git a/docker/supervisord.conf b/docker/supervisord.conf index 09d6632..51e1fd4 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -11,6 +11,6 @@ command=service mongod start --fork --logpath /var/log/mongod.log command=/etc/init.d/nginx start [program:pine] -command=grunt pine:serve +command=node /atlasvoyages/index.js atlas-voyages -- libgit2 0.26.0