extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-05 21:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with init (PID 1)

Browse Source
This commit is contained in:
root 2019-04-09 16:43:18 +03:00
parent 9ce1b7df16
commit f7edd4bf67
13 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
zbx_env/

9
agent/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.4 as builder
FROM alpine:3.9 as builder
ARG APK_FLAGS_COMMON=""
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
@ -38,7 +38,7 @@ RUN apk update && \
--silent && \
make -j"$(nproc)" -s
FROM alpine:3.4
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@ -86,6 +86,7 @@ RUN addgroup zabbix && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
apk update && \
apk add ${APK_FLAGS_PERSISTANT} \
tini \
bash \
coreutils \
iputils \
@ -100,4 +101,6 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]

8
docker-compose_v3_alpine_mysql_local.yaml
View File

@ -69,7 +69,7 @@ services:
build:
context: ./proxy-sqlite3/alpine
cache_from:
- alpine:3.4
- alpine:3.9
image: zabbix-proxy-sqlite3:alpine-3.2-local
ports:
- "10061:10051"
@ -291,7 +291,7 @@ services:
build:
context: ./agent/alpine
cache_from:
- alpine:3.4
- alpine:3.9
image: zabbix-agent:alpine-3.2-local
ports:
- "10050:10050"
@ -335,7 +335,7 @@ services:
build:
context: ./java-gateway/alpine
cache_from:
- alpine:3.4
- alpine:3.9
image: zabbix-java-gateway:alpine-3.2-local
ports:
- "10052:10052"
@ -366,7 +366,7 @@ services:
build:
context: ./snmptraps/alpine
cache_from:
- alpine:3.7
- alpine:3.9
image: zabbix-snmptraps:alpine-3.2-local
ports:
- "162:162/udp"

8
docker-compose_v3_alpine_pgsql_local.yaml
View File

@ -4,7 +4,7 @@ services:
build:
context: ./server-pgsql/alpine
cache_from:
- alpine:3.4
- alpine:3.9
image: zabbix-server-pgsql:alpine-3.2-local
ports:
- "10051:10051"
@ -182,7 +182,7 @@ services:
build:
context: ./web-apache-pgsql/alpine
cache_from:
- alpine:3.4
- alpine:3.9
image: zabbix-web-apache-pgsql:alpine-3.2-local
ports:
- "80:80"
@ -237,7 +237,7 @@ services:
build:
context: ./web-nginx-pgsql/alpine
cache_from:
- alpine:3.4
- alpine:3.9
image: zabbix-web-nginx-pgsql:alpine-3.2-local
ports:
- "8081:80"
@ -367,7 +367,7 @@ services:
build:
context: ./snmptraps/alpine
cache_from:
- alpine:3.7
- alpine:3.9
image: zabbix-snmptraps:alpine-3.2-local
ports:
- "162:162/udp"

3
java-gateway/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@ -30,6 +30,7 @@ RUN addgroup zabbix && \
chown --quiet -R zabbix:root /etc/zabbix && \
apk update && \
apk add ${APK_FLAGS_COMMON} \
tini \
bash \
openjdk8-jre-base && \
rm -rf /var/cache/apk/*

5
proxy-mysql/alpine/Dockerfile
View File

@ -42,6 +42,7 @@ RUN addgroup zabbix && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
iputils \
libcurl \
@ -131,4 +132,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]

7
proxy-sqlite3/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@ -41,6 +41,7 @@ RUN addgroup zabbix && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
fping \
iputils \
@ -126,4 +127,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]

5
server-mysql/alpine/Dockerfile
View File

@ -44,6 +44,7 @@ RUN addgroup zabbix && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
fping \
iputils \
@ -137,4 +138,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]

7
server-pgsql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@ -44,6 +44,7 @@ RUN addgroup zabbix && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
fping \
iputils \
@ -137,4 +138,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]

2
snmptraps/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE

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

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE

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

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE

5
zabbix-appliance/alpine/Dockerfile
View File

@ -141,6 +141,7 @@ RUN addgroup zabbix && \
ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
apk update && \
apk add ${APK_FLAGS_PERSISTENT} \
tini \
bash \
fping \
iputils \
@ -191,4 +192,6 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENV ZBX_TYPE=appliance
ENTRYPOINT ["docker-entrypoint.sh"]
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["docker-entrypoint.sh"]