Merge branch '1-reduce-layer' into 'master'

Resolve "Reduce layer"

Closes #1

See merge request interlink-sa/flowdat3/vendors/docker-sf-php!2

7_0/Dockerfile

@@ -1,19 +1,22 @@
 FROM debian:9
 EXPOSE 8000
-# install app
-RUN apt-get update && apt-get install -yq python curl git wget vim tmux graphviz php-cli php-mysql php-curl php-amqplib php-xml php-zip build-essential unzip php-bcmath php-mbstring mysql-client php-dom php-soap php-snmp php-intl php-gmp libcurl3-dev
 
-## install composer
-ADD composer.sh /opt/composer.sh
-RUN chmod +x /opt/composer.sh ; ./opt/composer.sh
+WORKDIR /opt
 
-# add keys ssh from hosts
-RUN mkdir ~/.ssh
-RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
-# add key to container
-ADD keys /opt/keys
-RUN chmod 0600 /opt/keys/*
+ADD composer.sh keys ./
+
+RUN apt-get update; \
+    apt-get install -yq python curl git wget vim zip python-pip iputils-ping \
+                        tmux graphviz php-cli php-mysql php-curl php-amqplib \
+                        php-xml php-zip build-essential unzip php-bcmath \
+                        php-mbstring mysql-client php-dom php-soap php-snmp \
+                        php-intl php-gmp libcurl3-dev php-fpm php-soap; \
+    chmod 0600 /opt/keys/*; \
+    chmod +x /opt/composer.sh; \
+    sh /opt/composer.sh; \
+    mkdir ~/.ssh; \
+    ssh-keyscan -H -p 22  gitlab.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts

7_1/Dockerfile

@@ -1,22 +1,27 @@
 FROM debian:9
 EXPOSE 8000
-# install app
-RUN apt-get update && apt-get install -yq wget apt-transport-https lsb-release ca-certificates
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-RUN apt-get update && apt-get install -yq python curl git wget vim tmux graphviz build-essential unzip mysql-client php7.1 php7.1-mysql php7.1-curl php7.1-xml php7.1-zip php7.1-bcmath php7.1-mbstring php7.1-dom php7.1-amqp php7.1-soap php7.1-snmp php7.1-intl php-gmp libcurl3-dev
 
-## install composer
-ADD composer.sh /opt/composer.sh
-RUN chmod +x /opt/composer.sh ; ./opt/composer.sh
+WORKDIR /opt
 
-# add keys ssh from hosts
-RUN mkdir ~/.ssh
-RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
-# add key to container
-ADD keys /opt/keys
-RUN chmod 0600 /opt/keys/*
+ADD composer.sh keys ./
+
+RUN apt-get update; \
+    apt-get install -yq wget apt-transport-https lsb-release ca-certificates;\
+    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; \
+    sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'; \
+    apt-get update; \
+    apt-get install -yq python curl git vim zip python-pip iputils-ping \
+                        tmux graphviz build-essential unzip mysql-client \
+                        php7.1 php7.1-mysql php7.1-curl php7.1-xml php7.1-zip \
+                        php7.1-bcmath php7.1-mbstring php7.1-dom php7.1-amqp \
+                        php7.1-soap php7.1-snmp php7.1-intl php-gmp \
+                        libcurl3-dev php7.1-fpm php7.1-soap; \  
+    chmod 0600 /opt/keys/*; \
+    chmod +x /opt/composer.sh; \
+    ./opt/composer.sh; \
+    mkdir ~/.ssh; \
+    ssh-keyscan -H -p 22  gitlab.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts