Обновление Docker файлов в силу новополученных знаний

This commit is contained in:
ErickSkrauch 2016-09-15 18:52:07 +03:00
parent 9d935d84cd
commit ffd17ace2c
6 changed files with 16 additions and 3 deletions

View File

@ -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 \

View File

@ -1,3 +1,6 @@
FROM mariadb:10.0
COPY mariadb.cnf /etc/mysql/conf.d
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["mysqld"]

View File

@ -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;"]

View File

@ -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 "$@"

View File

@ -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"]

View File

@ -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"]