From ffd17ace2c90e14b0d0acbfe7b10d75361a7a641 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Thu, 15 Sep 2016 18:52:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Docker=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B2=20=D1=81=D0=B8=D0=BB=D1=83=20=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B7=D0=BD=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                   | 4 +++-
 docker/mariadb/Dockerfile    | 3 +++
 docker/nginx/Dockerfile      | 3 ++-
 docker/nginx/run.sh          | 3 ++-
 docker/phpmyadmin/Dockerfile | 3 +++
 docker/rabbitmq/Dockerfile   | 3 +++
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c0f6d4d..cb36528 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update \
          libicu-dev \
          libmcrypt-dev \
          zlib1g-dev \
+         openssh-server \
      --no-install-recommends \
 
  # Install PHP extensions
@@ -59,7 +60,8 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
 # Поставим xdebug отдельно, т.к. потом его потенциально придётся отсюда убирать
-RUN yes | pecl install xdebug \
+# фиксируем версию, т.к. 2.4.1 не собирается под 7.1
+RUN yes | pecl install xdebug-2.4.0 \
  && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
  && echo "xdebug.default_enable=1" >> /usr/local/etc/php/conf.d/xdebug.ini \
  && echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/xdebug.ini \
diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile
index ae236a8..20afa74 100644
--- a/docker/mariadb/Dockerfile
+++ b/docker/mariadb/Dockerfile
@@ -1,3 +1,6 @@
 FROM mariadb:10.0
 
 COPY mariadb.cnf /etc/mysql/conf.d
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["mysqld"]
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index ed15437..d524401 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -7,4 +7,5 @@ COPY run.sh /run.sh
 RUN rm /etc/nginx/conf.d/default.conf \
  && chmod a+x /run.sh
 
-CMD ["/run.sh"]
+ENTRYPOINT ["/run.sh"]
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker/nginx/run.sh b/docker/nginx/run.sh
index 364e6e7..a4d80cf 100644
--- a/docker/nginx/run.sh
+++ b/docker/nginx/run.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
 envsubst '$AUTHSERVER_HOST:$PHP_LINK' < /etc/nginx/conf.d/account.ely.by.conf.template > /etc/nginx/conf.d/default.conf
-nginx -g 'daemon off;'
+
+exec "$@"
diff --git a/docker/phpmyadmin/Dockerfile b/docker/phpmyadmin/Dockerfile
index c054f47..62e24d4 100644
--- a/docker/phpmyadmin/Dockerfile
+++ b/docker/phpmyadmin/Dockerfile
@@ -3,3 +3,6 @@ FROM phpmyadmin/phpmyadmin
 RUN printf "\n\nrequire('./config.local.php');\n" >> /www/config.inc.php
 
 COPY config.local.php /www/
+
+ENTRYPOINT [ "/run.sh" ]
+CMD ["phpmyadmin"]
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index 27005d8..8e27027 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -3,3 +3,6 @@ FROM rabbitmq:3.6
 RUN rabbitmq-plugins enable rabbitmq_management \
  && rabbitmq-plugins enable rabbitmq_web_stomp \
  && rabbitmq-plugins enable rabbitmq_mqtt
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["rabbitmq-server"]