Updated Ubuntu images

This commit is contained in:
Alexey Pustovalov 2020-04-28 23:17:34 +03:00
parent 10ab9dba2d
commit b822f9ba49
7 changed files with 6 additions and 10 deletions

View File

@ -115,5 +115,4 @@ USER 1997
ENTRYPOINT ["docker-entrypoint.sh"]
#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

View File

@ -115,5 +115,4 @@ USER 1997
ENTRYPOINT ["docker-entrypoint.sh"]
#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

View File

@ -1,4 +1,4 @@
<VirtualHost *:80>
<VirtualHost *:8080>
DocumentRoot /usr/share/zabbix/
ServerName zabbix
DirectoryIndex index.php

View File

@ -3,7 +3,7 @@ LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
<IfModule mod_ssl.c>
<VirtualHost *:443>
<VirtualHost *:8443>
SSLEngine on
DocumentRoot /usr/share/zabbix/

View File

@ -2,7 +2,7 @@
// Zabbix GUI configuration file.
global $DB;
$DB['TYPE'] = 'MYSQL';
$DB['TYPE'] = 'POSTGRESQL';
$DB['SERVER'] = '{DB_SERVER_HOST}';
$DB['PORT'] = '{DB_SERVER_PORT}';
$DB['DATABASE'] = '{DB_SERVER_DBNAME}';

View File

@ -79,8 +79,7 @@ RUN set -eux && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
gettext \
git \
locales && \
git && \
cd /usr/share/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
mkdir /usr/share/zabbix/ && \
@ -111,8 +110,7 @@ RUN set -eux && \
chmod -R g=u /var/lib/php/session/ && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge \
gettext \
git \
locales && \
git && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*

View File

@ -2,7 +2,7 @@
// Zabbix GUI configuration file.
global $DB;
$DB['TYPE'] = 'MYSQL';
$DB['TYPE'] = 'POSTGRESQL';
$DB['SERVER'] = '{DB_SERVER_HOST}';
$DB['PORT'] = '{DB_SERVER_PORT}';
$DB['DATABASE'] = '{DB_SERVER_DBNAME}';