extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 08:35:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Ubuntu images

Browse Source
This commit is contained in:
Alexey Pustovalov
2020-04-28 21:22:44 +03:00
parent 48921eb897
commit 81be9d6ae5
25 changed files with 267 additions and 2823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web-apache-mysql/ubuntu/Dockerfile
View File

@ -35,6 +35,7 @@ RUN set -eux && \
php7.2-mysql \
php7.2-xml && \
rm -f /etc/apache2/sites-available/* && \
rm -f /etc/apache2/sites-enabled/* && \
/usr/sbin/a2enmod ssl && \
sed -ri \
-e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
@ -115,4 +116,5 @@ USER 1997
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

2
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -183,7 +183,7 @@ check_db_connect() {
}
prepare_web_server() {
APACHE_SITES_DIR="/etc/apache2/sites-available"
APACHE_SITES_DIR="/etc/apache2/sites-enabled"
echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then