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

Updated Ubuntu to 18.04 (bionic) release

Browse Source
This commit is contained in:
root
2018-07-19 19:42:21 +09:00
parent 8648a1c6d2 e3a3f68138
commit 43a2b1bb51
99 changed files with 376 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java-gateway/ubuntu/Dockerfile
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-${ZBX_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 \
@ -34,7 +36,7 @@ RUN locale-gen $LC_ALL && \
chown --quiet -R zabbix:root /etc/zabbix && \
apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \
openjdk-7-jre-headless && \
openjdk-8-jre-headless && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
@ -55,7 +57,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
automake \
libc6-dev \
make \
openjdk-7-jdk \
openjdk-8-jdk \
pkg-config \
subversion \
gcc && \
@ -85,7 +87,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
automake \
libc6-dev \
make \
openjdk-7-jdk \
openjdk-8-jdk \
pkg-config \
subversion \
gcc && \

2
java-gateway/ubuntu/README.md
View File

@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav
# Zabbix Java Gateway images
These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

5
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -593,6 +593,7 @@ prepare_web_server_nginx() {
fi
ln -sf /dev/fd/2 /var/log/php5-fpm.log
ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
}
stop_databases() {
@ -833,6 +834,10 @@ prepare_zbx_web_config() {
PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
fi
if [ -n "$PHP_CONFIG_FILE" ]; then