Merge pull request #198 from zabbix/master

Master

web-apache-pgsql/ubuntu/Dockerfile

@@ -1,5 +1,8 @@
 FROM ubuntu:trusty
-LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+
+ARG BUILD_DATE
+ARG VCS_REF
 
 ARG APT_FLAGS_COMMON="-qq -y"
 ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
@@ -7,10 +10,19 @@ ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG DB_TYPE=postgresql
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm
 
-RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
-    locale-gen $LC_ALL && \
+LABEL org.label-schema.name="zabbix-web-apache-${DB_TYPE}-ubuntu" \
+      org.label-schema.vendor="Zabbix LLC" \
+      org.label-schema.url="https://zabbix.com/" \
+      org.label-schema.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \
+      org.label-schema.vcs-ref="${VCS_REF}" \
+      org.label-schema.build-date="${BUILD_DATE}" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.license="GPL 2.0"
+
+STOPSIGNAL SIGTERM
+
+RUN locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
-    echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \
     addgroup --system --quiet zabbix && \
     adduser --quiet \
             --system --disabled-login \
@@ -23,14 +35,14 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
     chown --quiet -R zabbix:root /etc/zabbix && \
     apt-get ${APT_FLAGS_COMMON} update && \
     apt-get ${APT_FLAGS_PERSISTANT} install \
-            supervisor \
-            postgresql-client \
             apache2 \
             libapache2-mod-php5 \
-            php5-pgsql \
             php5-gd \
             php5-json \
             php5-ldap \
+            php5-pgsql \
+            postgresql-client \
+            supervisor \
             ttf-dejavu-core 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \
@@ -41,27 +53,18 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.14
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
-ADD conf/tmp/font-config /tmp/font-config
+LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.label-schema.version="${ZBX_VERSION}" \
+      org.label-schema.vcs-url="${ZBX_SOURCES}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-web-apache-${DB_TYPE} --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-apache-${DB_TYPE}:ubuntu-${ZBX_VERSION}"
+
+COPY ["conf/tmp/font-config", "/tmp/font-config"]
 
 RUN apt-get ${APT_FLAGS_COMMON} update && \
     apt-get ${APT_FLAGS_DEV} install \
-            subversion \
+            gettext \
             patch \
-            gettext 1>/dev/null && \
-    mkdir -p /var/lib/locales/supported.d/ && \
-    echo "en_US.UTF-8 UTF-8" > /var/lib/locales/supported.d/local && \
-    echo "ru_RU.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "ja_JP.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "cs_CZ.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "ko_KR.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "it_IT.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "pt_BR.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "sk_SK.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "uk_UA.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "fr_FR.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "pl_PL.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    echo "zh_CN.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local && \
-    dpkg-reconfigure locales 1>/dev/null && \
+            subversion 1>/dev/null && \
     cd /usr/share/ && \
     svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \
     cd /usr/share/zabbix/ && \
@@ -73,13 +76,22 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
     ./locale/make_mo.sh 2>/dev/null && \
     update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \
             zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \
+    mkdir -p /var/lib/locales/supported.d/ && \
+    rm -f /var/lib/locales/supported.d/local && \
+    cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
+                cut -d"'" -f 2 | sort | \
+                xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \
+    dpkg-reconfigure locales 1>/dev/null && \
+    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 \
-            subversion \
+            gettext \
             patch \
-            gettext 1>/dev/null && \
+            subversion 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /root/.subversion
 
 EXPOSE 80/TCP 443/TCP
 
@@ -87,13 +99,13 @@ WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/apache2"]
 
-ADD conf/etc/supervisor/ /etc/supervisor/
-ADD conf/etc/zabbix/apache.conf /etc/zabbix/
-ADD conf/etc/zabbix/apache_ssl.conf /etc/zabbix/
-ADD conf/etc/zabbix/web/zabbix.conf.php /etc/zabbix/web/
-ADD conf/etc/php5/apache2/conf.d/99-zabbix.ini /etc/php5/apache2/conf.d/
-ADD run_zabbix_component.sh /
+COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
+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 ["docker-entrypoint.sh", "/usr/bin/"]
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["docker-entrypoint.sh"]
 
-CMD ["/run_zabbix_component.sh", "frontend", "postgresql", "apache"]
+CMD ["frontend", "postgresql", "apache"]