Metabase conf

docker/mariaDb/Dockerfile

@@ -1,8 +1,24 @@
 # ./docker/php/Dockerfile
 FROM mariadb:10.4
 
+ARG COMPOSER_HASH
+
 RUN apt-get update; \
-    apt-get install -y --no-install-recommends nano openssh-server;
+    apt-get install -y --no-install-recommends nano openssh-server build-essential libssl-dev ca-certificates zlib1g-dev  php7.2-cli \
+                                                                       php7.2-json \
+                                                                       php7.2-fpm \
+                                                                       php7.2-mbstring \
+                                                                       php7.2-mysql \
+                                                                       php7.2-zip \
+                                                                       php7.2-xml;
+
+## COMPOSER
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; \
+    php -r "if (hash_file('sha384', 'composer-setup.php') === '$COMPOSER_HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"; \
+    php composer-setup.php; \
+    php -r "unlink('composer-setup.php');"; \
+    mv composer.phar /usr/local/bin/composer;
+
 
 COPY /.ssh /root/.ssh
 COPY /docker/mariaDb/conf/my.cnf /etc/mysql/conf.d/

docker/node/Dockerfile

@@ -13,14 +13,15 @@ RUN npm install npm@3.5.2; \
     apt-get update; \
     # Install dependencies
     apt-get install -yqq --no-install-recommends git bzip2 curl unzip; \
-    npm install -g gulp bower jison babel-cli babel-preset-es2015 babel-preset-stage-2 typescript@next; \
+    npm install -g gulp bower jison babel-cli typescript@next; \
     npm cache clean; \
     apt-get -yqq autoremove; \
     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; \
-    npm install;
+    echo '{ "allow_root": true }' > /root/.bowerrc;
+
+RUN 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

docker/php/Dockerfile

@@ -18,7 +18,7 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb; \
     dpkg -i wkhtmltox_0.12.5-1.jessie_amd64.deb; \
     ## ELASTICADUMP
-    curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash; - \
+    curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -; \
     apt-get install nodejs -y; \
     npm install elasticdump@3.3.7 -g; \
     ## COMPOSER
@@ -70,12 +70,8 @@ COPY /docker/php/conf/xdebug.ini /usr/local/etc/php/conf.d
 
 WORKDIR /var/www/html
 
-CMD if [ "x$OS" = "MAC" ] ; then HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1); \
+CMD HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1); \
     setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs && setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs; \
     chown -R www-data:www-data /var/www/html/web; \
     php-fpm; \
-    else HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1); \
-    setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs && setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs;\
-    chown -R www-data:www-data /var/www/html/web; \
-    php-fpm; \
     fi;