Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
TOUZE Francois
PSPA
Commits
149e30f0
Commit
149e30f0
authored
Sep 18, 2020
by
TOUZE Francois
Browse files
conflits réglés
parents
9bfe10e3
82106548
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
34 deletions
+8
-34
docker/docker-compose.yml
docker/docker-compose.yml
+2
-2
docker/dockerfiles/back_contro_docker/back_controller.dockerfile
...dockerfiles/back_contro_docker/back_controller.dockerfile
+6
-8
docker/dockerfiles/docker-compose.yml
docker/dockerfiles/docker-compose.yml
+0
-24
No files found.
docker/docker-compose.yml
View file @
149e30f0
...
...
@@ -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"
docker/dockerfiles/back_contro_docker/back_controller.dockerfile
View file @
149e30f0
...
...
@@ -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
...
...
docker/dockerfiles/docker-compose.yml
deleted
100644 → 0
View file @
9bfe10e3
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"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment