Vincent GUFFON 5 år sedan
förälder
incheckning
87501ac7a6
3 ändrade filer med 3 tillägg och 3 borttagningar
  1. 0 1
      docker/mariaDb/Dockerfile
  2. 2 1
      docker/node/Dockerfile
  3. 1 1
      docker/php/Dockerfile

+ 0 - 1
docker/mariaDb/Dockerfile

@@ -4,7 +4,6 @@ FROM mariadb:10.4
 RUN apt-get update; \
     apt-get install -y --no-install-recommends nano openssh-server;
 
-COPY /apps/opentalent-platform/migration /usr/src
 COPY /.ssh /root/.ssh
 COPY /docker/mariaDb/conf/my.cnf /etc/mysql/conf.d/
 

+ 2 - 1
docker/node/Dockerfile

@@ -19,7 +19,8 @@ RUN npm install npm@3.5.2; \
     apt-get -yqq clean;  \
     rm -rf /var/lib/apt/lists/* /var/cache/* /tmp/* /var/tmp/*; \
     # Allow root for bower
-    echo '{ "allow_root": true }' > /root/.bowerrc;
+    echo '{ "allow_root": true }' > /root/.bowerrc; \
+    npm install;
 
 CMD cd modules/ruler && jison -t rule.jison && babel --presets=es2015 model/**/*.js model/*.js -d lib && npm link && cd ../.. && npm link @opentalent/ruler \
     && node

+ 1 - 1
docker/php/Dockerfile

@@ -7,7 +7,7 @@ ARG OS
 RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     apt-get update; \
     ### WKHTMLTOPDF
-    if [ "x$OS" = "MAC" ] ; then apt-get install -y --no-install-recommends build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    if [ "x$OS" = "MAC" ] ; then apt-get install -y --no-install-recommends openssh-server build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
     else DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
     fi; \
     wget http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \