Commit 149e30f0 authored by TOUZE Francois's avatar TOUZE Francois
Browse files

conflits réglés

parents 9bfe10e3 82106548
......@@ -11,8 +11,6 @@ services:
- pspa_net
ports:
- "8080:8080"
volumes:
- "$PSPA_WORKSPACE:/home/workZone"
depends_on:
- backend_services
......@@ -22,3 +20,5 @@ services:
- pspa_net
ports:
- "5000:5000"
volumes:
- "$PSPA_WORKSPACE:/home/workZone"
......@@ -39,9 +39,7 @@ RUN apt-get install -y wget \
RUN cd /usr/local \
&& git clone https://gitlab.in2p3.fr/PSPA/accelerator-ml-code.git \
&& cd accelerator-ml-code \
&& hg update develop \
&& make clean \
&& make libs
&& make clean libs
RUN cd /usr/local \
&& wget http://www.cmtsite.net/$CMT_VERSION/$CMT_PKG \
......@@ -100,11 +98,11 @@ RUN cd /home/pspa/controller \
COPY package.json /home/pspa/frontend/package.json
RUN chmod -R 755 /home/pspa/softwares
RUN cd /home/pspa/frontend \
&& apt-get install -y curl sudo \
&& curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - \
&& apt-get install -y nodejs \
&& npm install
#RUN cd /home/pspa/frontend \
# && apt-get install -y curl sudo \
# && curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - \
# && apt-get install -y nodejs \
# && npm install
COPY launch_controller_pspa.sh /home/pspa
......
version: '2.1'
networks:
pspa_net:
driver: bridge
services:
pspa_services:
image: frontend_box
networks:
- pspa_net
ports:
- "8080:8080"
volumes:
- "$PSPA_WORKSPACE:/home/workZone"
depends_on:
- backend_services
backend_services:
image : back_contr_box
networks:
- pspa_net
ports:
- "5000:5000"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment