extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 16:45:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary arguments and redesigned docker files for Alpine images

Browse Source
This commit is contained in:
Alexey Pustovalov
2019-10-03 15:39:55 +03:00
parent 5e9a363267
commit c593d36151
8 changed files with 129 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
web-apache-pgsql/alpine/Dockerfile
View File

@ -1,23 +1,11 @@
FROM alpine:3.10
ARG APK_FLAGS_PERSISTENT="--clean-protected --no-cache"
ARG APK_FLAGS_DEV="--no-cache"
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.vendor="Zabbix LLC" \
org.opencontainers.image.url="https://zabbix.com/" \
org.opencontainers.image.description="abbix web-interface based on Apache2 web server with PostgreSQL database support" \
org.opencontainers.image.licenses="GPL v2.0" \
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
org.opencontainers.image.version="${ZBX_VERSION}" \
org.opencontainers.image.source="${ZBX_SOURCES}"
org.opencontainers.image.licenses="GPL v2.0"
STOPSIGNAL SIGTERM
@ -31,8 +19,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix && \
mkdir -p /etc/zabbix/web && \
chown --quiet -R zabbix:root /etc/zabbix && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
apk add --clean-protected --no-cache \
apache2 \
bash \
curl \
@ -52,7 +39,7 @@ RUN set -eux && \
php7-xmlreader \
php7-xmlwriter \
postgresql-client && \
apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
rm -f "/etc/apache2/conf.d/default.conf" && \
rm -f "/etc/apache2/conf.d/ssl.conf" && \
sed -ri \
@ -65,8 +52,18 @@ RUN set -eux && \
rm -f "/var/run/apache2/apache2.pid" && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
org.opencontainers.image.version="${ZBX_VERSION}" \
org.opencontainers.image.source="${ZBX_SOURCES}"
RUN set -eux && \
apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
apk add --no-cache --virtual build-dependencies \
gettext \
git && \
cd /usr/share/ && \