Updated Ubuntu to 18.04 (bionic) release

This commit is contained in:
root
2018-07-20 11:23:08 +09:00
99 changed files with 382 additions and 199 deletions

View File

@@ -1,4 +1,4 @@
FROM ubuntu:trusty
FROM ubuntu:bionic
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@@ -21,7 +21,9 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${DB_TYPE}-ubuntu" \
STOPSIGNAL SIGTERM
RUN locale-gen $LC_ALL && \
RUN apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install locales && \
locale-gen $LC_ALL && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
addgroup --system --quiet zabbix && \
adduser --quiet \
@@ -37,12 +39,15 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTENT} install \
apache2 \
curl \
libapache2-mod-php5 \
libapache2-mod-php \
mysql-client \
php5-gd \
php5-json \
php5-ldap \
php5-mysql \
php7.2-bcmath \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml \
ttf-dejavu-core && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \
@@ -102,7 +107,7 @@ VOLUME ["/etc/ssl/apache2"]
COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/php5/apache2/conf.d/99-zabbix.ini", "/etc/php5/apache2/conf.d/"]
COPY ["conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini", "/etc/php/7.2/apache2/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]