extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-30 03:33:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 3.0

Browse Source
This commit is contained in:
root 2018-02-22 12:54:07 -08:00
commit 8e36252f50
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -38,7 +38,7 @@ RUN locale-gen $LC_ALL && \
wget 1>/dev/null && \ wget 1>/dev/null && \
DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \ wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \
echo "deb https://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ 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_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTANT} install \ apt-get ${APT_FLAGS_PERSISTANT} install \
mysql-client \ mysql-client \

2
web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -38,7 +38,7 @@ RUN locale-gen $LC_ALL && \
wget 1>/dev/null && \ wget 1>/dev/null && \
DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \ wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \
echo "deb https://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ 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_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTANT} install \ apt-get ${APT_FLAGS_PERSISTANT} install \
nginx \ nginx \