Merge pull request #264 from zabbix/master

Fixed small issues. Preparation for Appliance

zabbix-appliance/alpine/Dockerfile

@@ -52,17 +52,13 @@ RUN addgroup zabbix && \
             libldap \
             libssh2 \
             libxml2 \
+            mariadb-client \
+            mariadb-client-libs \
             mysql \
-            openjdk8-jre-base \
-            mariadb-client \
-            mariadb-client-libs \
             net-snmp-agent-libs \
-            openipmi-libs \
-            unixodbc \
-            bash \
-            mariadb-client \
-            mariadb-client-libs \
             nginx \
+            openipmi-libs \
+            openjdk8-jre-base \
             php5-bcmath \
             php5-ctype \
             php5-fpm \
@@ -74,7 +70,8 @@ RUN addgroup zabbix && \
             php5-sockets \
             php5-xmlreader \
             supervisor \
-            ttf-dejavu && \
+            ttf-dejavu \
+            unixodbc && \
     rm -rf /var/cache/apk/*
 
 ARG MAJOR_VERSION=3.0
@@ -95,13 +92,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             automake \
             coreutils \
             curl-dev \
+            gettext \
             libssh2-dev \
             libxml2-dev \
-            openjdk8 \
             mysql-dev \
-            gettext \
             net-snmp-dev \
             openipmi-dev \
+            openjdk8 \
             openldap-dev \
             subversion \
             unixodbc-dev && \

zabbix-appliance/alpine/build.sh

@@ -23,4 +23,4 @@ docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --b
 #docker rm -f zabbix-appliance
 
 #sleep 5
-#docker run --name zabbix-appliance -t -d -p 80:80 zabbix:$os-$version
+#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version

zabbix-appliance/centos/Dockerfile

@@ -45,10 +45,20 @@ RUN groupadd --system zabbix && \
     yum ${YUM_FLAGS_COMMON} makecache && \
     yum ${YUM_FLAGS_DEV} install epel-release && \
     yum ${YUM_FLAGS_PERSISTANT} install \
+            OpenIPMI-libs \
             dejavu-sans-fonts \
+            fping \
+            iksemel \
+            java-1.8.0-openjdk-headless \
+            libcurl \
+            libxml2 \
             mariadb \
             mariadb-server \
+            net-snmp-libs \
             nginx \
+            openldap \
+            openssl-libs \
+            pcre \
             php-bcmath \
             php-fpm \
             php-gd \
@@ -56,18 +66,8 @@ RUN groupadd --system zabbix && \
             php-mbstring \
             php-mysql \
             php-xml \
-            fping \
+            supervisor \
-            iksemel \
+            unixODBC && \
-            libcurl \
-            libxml2 \
-            net-snmp-libs \
-            OpenIPMI-libs \
-            openldap \
-            openssl-libs \
-            pcre \
-            unixODBC \
-            java-1.8.0-openjdk-headless \
-            supervisor && \
     rm -f /etc/php-fpm.d/www.conf && \
     mkdir -p /var/lib/php/ && \
     chown --quiet -R nginx:nginx /var/lib/php/ && \
@@ -88,12 +88,12 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"]
 
 RUN yum --quiet makecache && \
     yum ${YUM_FLAGS_DEV} install \
-            gettext \
-            patch \
             autoconf \
             automake \
             gcc \
+            gettext \
             iksemel-devel \
+            java-1.8.0-openjdk-devel \
             libcurl-devel \
             libssh2-devel \
             libxml2-devel \
@@ -102,11 +102,9 @@ RUN yum --quiet makecache && \
             net-snmp-devel \
             OpenIPMI-devel \
             openldap-devel \
+            patch \
             subversion \
-            unixODBC-devel \
+            unixODBC-devel && \
-            java-1.8.0-openjdk-devel \
-            subversion \
-            gcc && \
     cd /tmp/ && \
     svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
     cd /tmp/zabbix-${ZBX_VERSION} && \

zabbix-appliance/centos/build.sh

@@ -23,4 +23,4 @@ docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --b
 #docker rm -f zabbix-appliance
 
 #sleep 5
-#docker run --name zabbix-appliance -t -d -p 80:80 zabbix:$os-$version
+#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version

zabbix-appliance/ubuntu/Dockerfile

@@ -55,16 +55,6 @@ RUN locale-gen $LC_ALL && \
     echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
     apt-get ${APT_FLAGS_COMMON} update && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
-            mysql-server \
-            mysql-client \
-            nginx \
-            php5-fpm \
-            php5-gd \
-            php5-json \
-            php5-ldap \
-            php5-mysql \
-            supervisor \
-            ttf-dejavu-core \
             fping \
             libcurl3 \
             libiksemel3 \
@@ -75,9 +65,18 @@ RUN locale-gen $LC_ALL && \
             libssl1.0.0 \
             libxml2 \
             mysql-client \
+            mysql-server \
+            nginx \
+            openjdk-7-jre-headless \
+            php5-fpm \
+            php5-gd \
+            php5-json \
+            php5-ldap \
+            php5-mysql \
             snmp-mibs-downloader \
-            unixodbc \
+            supervisor \
-            openjdk-7-jre-headless 1>/dev/null && \
+            ttf-dejavu-core \
+            unixodbc 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} purge \
             wget 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
@@ -101,12 +100,10 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"]
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \
     apt-get ${APT_FLAGS_DEV} install \
-            gettext \
-            patch \
-            subversion \
             autoconf \
             automake \
             gcc \
+            gettext \
             libc6-dev \
             libcurl4-openssl-dev \
             libiksemel-dev \
@@ -117,17 +114,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             libssh2-1-dev \
             libxml2-dev \
             make \
-            pkg-config \
-            subversion \
-            unixodbc-dev \
-            autoconf \
-            automake \
-            libc6-dev \
-            make \
             openjdk-7-jdk \
+            patch \
             pkg-config \
             subversion \
-            gcc 1>/dev/null && \
+            unixodbc-dev 1>/dev/null && \
     cd /tmp/ && \
     svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
@@ -195,12 +186,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
     find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \
     find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
     apt-get ${APT_FLAGS_COMMON} purge \
-            gettext \
-            patch \
-            subversion \
             autoconf \
             automake \
             gcc \
+            gettext \
             libc6-dev \
             libcurl4-openssl-dev \
             libiksemel-dev \
@@ -211,17 +200,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             libssh2-1-dev \
             libxml2-dev \
             make \
-            pkg-config \
-            subversion \
-            unixodbc-dev \
-            autoconf \
-            automake \
-            libc6-dev \
-            make \
             openjdk-7-jdk \
+            patch \
             pkg-config \
             subversion \
-            gcc 1>/dev/null && \
+            unixodbc-dev 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \
     rm -rf /var/lib/apt/lists/* && \

zabbix-appliance/ubuntu/build.sh

@@ -23,4 +23,4 @@ docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --b
 #docker rm -f zabbix-appliance
 
 #sleep 5
-#docker run --name zabbix-appliance -t -d -p 80:80 zabbix:$os-$version
+#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version