diff --git a/Dockerfiles/agent/README.md b/Dockerfiles/agent/README.md index 2fac6f7d5..b4c810e5d 100644 --- a/Dockerfiles/agent/README.md +++ b/Dockerfiles/agent/README.md @@ -45,7 +45,7 @@ Where `some-zabbix-agent` is the name you want to assign to your container, `som This image exposes the standard Zabbix agent port (``10050``) to perform passive checks, so container linking makes Zabbix agent instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent container: ```console -$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent -d zabbix/zabbix-server:latest +$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent --init -d zabbix/zabbix-server:latest ``` ## Connect to Zabbix server or Zabbix proxy containers (Active checks) @@ -53,7 +53,7 @@ $ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent -d This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent instance. Start your application container like this in order to link Zabbix agent to Zabbix server or Zabbix proxy containterns: ```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -d zabbix/zabbix-agent:latest +$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-agent:latest ``` ## Container shell access and viewing Zabbix agent logs @@ -75,10 +75,10 @@ $ docker logs some-zabbix-agent By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent is designed to monitor system resources, to do that Zabbix agent container must be privileged or you may mount some system-wide volumes. For example: ```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged -d zabbix/zabbix-agent:latest +$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged --init -d zabbix/zabbix-agent:latest ``` ```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc -d zabbix/zabbix-agent:latest +$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc --init -d zabbix/zabbix-agent:latest ``` ## Environment Variables diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 7c39c6a80..dae0ef1a4 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -32,8 +32,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf", "/etc/zabbix/zabbix_agentd.conf"] RUN set -eux && \ - INSTALL_PKGS="tini \ - bash \ + INSTALL_PKGS="bash \ tzdata \ coreutils \ iputils \ @@ -76,7 +75,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 356b3efd5..9e2ff189f 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -34,7 +34,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf", "/etc RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="bash \ - tini \ tzdata \ iputils \ pcre2 \ @@ -78,7 +77,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index cb039b7bb..e84373811 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -34,7 +34,6 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ tzdata \ iputils \ pcre2 \ @@ -80,7 +79,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 482dd01ae..4d3577dc7 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -52,7 +52,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf", "/etc RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ tzdata \ iputils \ shadow-utils \ @@ -105,7 +104,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 24b93a9b4..1eef5bed1 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -34,7 +34,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf", "/etc RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tini \ tzdata \ ca-certificates \ libssl3 \ @@ -77,7 +76,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent2/README.md b/Dockerfiles/agent2/README.md index 7235242df..24f19847e 100644 --- a/Dockerfiles/agent2/README.md +++ b/Dockerfiles/agent2/README.md @@ -34,7 +34,7 @@ Images are updated when new releases are published. The image with ``latest`` ta Start a Zabbix agent 2 container as follows: - docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" -d zabbix/zabbix-agent2:tag + docker run --name some-zabbix-agent -e ZBX_HOSTNAME="some-hostname" -e ZBX_SERVER_HOST="some-zabbix-server" --init -d zabbix/zabbix-agent2:tag Where `some-zabbix-agent2` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix agent 2 configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server or proxy and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-agent2/tags/). @@ -43,7 +43,7 @@ Where `some-zabbix-agent2` is the name you want to assign to your container, `so This image exposes the standard Zabbix agent 2 port (``10050``) to perform passive checks, so container linking makes Zabbix agent 2 instance available to Zabbix server and Zabbix proxy containers. Start your application container like this in order to link it to the Zabbix agent 2 container: ```console -$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 -d zabbix/zabbix-server:latest +$ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 --init -d zabbix/zabbix-server:latest ``` ## Connect to Zabbix server or Zabbix proxy containers (Active checks) @@ -51,7 +51,7 @@ $ docker run --name some-zabbix-server --link some-zabbix-agent:zabbix-agent2 -d This image supports perform active checks, so container linking makes Zabbix server and Zabbix proxy containers available to Zabbix agent 2 instance. Start your application container like this in order to link Zabbix agent 2 to Zabbix server or Zabbix proxy containterns: ```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -d zabbix/zabbix-agent2:latest +$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-agent2:latest ``` ## Container shell access and viewing Zabbix agent 2 logs @@ -73,10 +73,10 @@ $ docker logs some-zabbix-agent By default, Docker containers are "unprivileged" and do not have access to the most of host resources. Zabbix agent 2 is designed to monitor system resources, to do that Zabbix agent 2 container must be privileged or you may mount some system-wide volumes. For example: ```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged -d zabbix/zabbix-agent2:latest +$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server --privileged --init -d zabbix/zabbix-agent2:latest ``` ```console -$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc -d zabbix/zabbix-agent2:latest +$ docker run --name some-zabbix-agent --link some-zabbix-server:zabbix-server -v /dev/sdc:/dev/sdc --init -d zabbix/zabbix-agent2:latest ``` ## Environment Variables diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 4b01a645e..932e6e77e 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -37,8 +37,7 @@ COPY --from=builder ["/tmp/mongodb_plugin/zabbix-agent2-plugin-mongodb", "/usr/s COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", "/usr/sbin/zabbix-agent2-plugin/zabbix-agent2-plugin-postgresql"] RUN set -eux && \ - INSTALL_PKGS="tini \ - tzdata \ + INSTALL_PKGS="tzdata \ bash \ pcre2 \ coreutils \ @@ -80,7 +79,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index e7ee5439b..2337ad79f 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -39,7 +39,6 @@ COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", " RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="bash \ - tini \ tzdata \ iputils \ pcre2 \ @@ -87,7 +86,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index cea7b87ca..f6fba30e4 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -39,7 +39,6 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ tzdata \ iputils \ pcre2 \ @@ -88,7 +87,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 165d146ad..1d3eafcf0 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -57,7 +57,6 @@ COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", " RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ tzdata \ iputils \ shadow-utils \ @@ -114,7 +113,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 2e4981878..de6128a29 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -38,8 +38,7 @@ COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", " RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ - INSTALL_PKGS="tini \ - tzdata \ + INSTALL_PKGS="tzdata \ ca-certificates \ smartmontools \ sudo \ @@ -83,7 +82,7 @@ WORKDIR /var/lib/zabbix COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md index d1929443a..287d887cc 100644 --- a/Dockerfiles/proxy-mysql/README.md +++ b/Dockerfiles/proxy-mysql/README.md @@ -42,7 +42,7 @@ The image uses MySQL database to store collected data before sending it to Zabbi Start a Zabbix proxy container as follows: - docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server -d zabbix/zabbix-proxy-mysql:tag + docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-mysql:tag Where `some-zabbix-proxy-mysql` is the name you want to assign to your container, `some-mysql-server` is IP or DNS name of MySQL server, `some-user` is user to connect to Zabbix database on MySQL server, `some-password` is the password to connect to MySQL server, `some-hostname` is the hostname, it is Hostname parameter in Zabbix proxy configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-proxy-mysql/tags/). @@ -51,7 +51,7 @@ Where `some-zabbix-proxy-mysql` is the name you want to assign to your container This image exposes the standard Zabbix proxy port (10051) and can operate as Passive proxy in case `ZBX_PROXYMODE` = `1`. Start Zabbix server container like this in order to link it to the Zabbix proxy container: ```console -$ docker run --name some-zabbix-server --link some-zabbix-proxy-mysql:zabbix-proxy-mysql -d zabbix/zabbix-server:latest +$ docker run --name some-zabbix-server --link some-zabbix-proxy-mysql:zabbix-proxy-mysql --init -d zabbix/zabbix-server:latest ``` ## Connect to Zabbix server (Active proxy) @@ -59,7 +59,7 @@ $ docker run --name some-zabbix-server --link some-zabbix-proxy-mysql:zabbix-pro This image can operate as Active proxy (`default` mode). Start your application container like this in order to link Zabbix proxy to Zabbix server containters: ```console -$ docker run --name some-zabbix-proxy-mysql --link some-zabbix-server:zabbix-server -d zabbix/zabbix-proxy-mysql:latest +$ docker run --name some-zabbix-proxy-mysql --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-proxy-mysql:latest ``` ## Container shell access and viewing Zabbix proxy logs @@ -111,7 +111,7 @@ This variable is port of MySQL server. By default, value is '3306'. These variables are used by Zabbix proxy to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`! ```console -docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server -d zabbix/zabbix-proxy-mysql:tag +docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-mysql:tag ``` With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! @@ -119,7 +119,7 @@ With Docker Swarm or Kubernetes this works with secrets. That way it is replicat ```console printf "zabbix" | docker secret create MYSQL_USER - printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server -d zabbix/zabbix-proxy-mysql:tag +docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-mysql:tag ``` This method is also applicable for `MYSQL_ROOT_PASSWORD` with `MYSQL_ROOT_PASSWORD_FILE`. diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 79a5265ac..74b5cca31 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -35,7 +35,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -97,7 +96,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index c18a76150..d5a9a0491 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -36,7 +36,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ REPOLIST="baseos,appstream,crb,epel" && \ INSTALL_PKGS="libevent \ - tini \ sudo \ traceroute \ nmap \ @@ -104,7 +103,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index f08b64935..257c6d29e 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -36,7 +36,6 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="libevent \ - tini \ sudo \ traceroute \ nmap \ @@ -106,7 +105,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 4b8cfc4bc..6cd1647f2 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -54,7 +54,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -137,7 +136,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index dffddb5e9..5d02a9e34 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -36,8 +36,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ - INSTALL_PKGS="tini \ - sudo \ + INSTALL_PKGS="sudo \ traceroute \ nmap \ ca-certificates \ @@ -101,7 +100,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-sqlite3/README.md b/Dockerfiles/proxy-sqlite3/README.md index f72a3dbc4..b070dc588 100644 --- a/Dockerfiles/proxy-sqlite3/README.md +++ b/Dockerfiles/proxy-sqlite3/README.md @@ -38,7 +38,7 @@ The image uses SQLite3 database to store collected data before sending it to Zab Start a Zabbix proxy container as follows: - docker run --name some-zabbix-proxy-sqlite3 -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server -d zabbix/zabbix-proxy-sqlite3:tag + docker run --name some-zabbix-proxy-sqlite3 -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-sqlite3:tag Where `some-zabbix-proxy-sqlite3` is the name you want to assign to your container, `some-hostname` is the hostname, it is Hostname parameter in Zabbix proxy configuration file, `some-zabbix-server` is IP or DNS name of Zabbix server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-proxy-sqlite3/tags/). @@ -47,7 +47,7 @@ Where `some-zabbix-proxy-sqlite3` is the name you want to assign to your contain This image exposes the standard Zabbix proxy port (10051) and can operate as Passive proxy in case `ZBX_PROXYMODE` = `1`. Start Zabbix server container like this in order to link it to the Zabbix proxy container: ```console -$ docker run --name some-zabbix-server --link some-zabbix-proxy-sqlite3:zabbix-proxy-sqlite3 -d zabbix/zabbix-server:latest +$ docker run --name some-zabbix-server --link some-zabbix-proxy-sqlite3:zabbix-proxy-sqlite3 --init -d zabbix/zabbix-server:latest ``` ## Connect to Zabbix server (Active proxy) @@ -55,7 +55,7 @@ $ docker run --name some-zabbix-server --link some-zabbix-proxy-sqlite3:zabbix-p This image can operate as Active proxy (`default` mode). Start your application container like this in order to link Zabbix proxy to Zabbix server containters: ```console -$ docker run --name some-zabbix-proxy-sqlite3 --link some-zabbix-server:zabbix-server -d zabbix/zabbix-proxy-sqlite3:latest +$ docker run --name some-zabbix-proxy-sqlite3 --link some-zabbix-server:zabbix-server --init -d zabbix/zabbix-proxy-sqlite3:latest ``` ## Container shell access and viewing Zabbix proxy logs diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index c82cc0b34..e9135a3b6 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -34,7 +34,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -95,7 +94,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index cc23d8c56..74d0b452d 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -35,7 +35,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="libevent \ - tini \ sudo \ traceroute \ nmap \ @@ -101,7 +100,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 400907fdb..ce7d87366 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -35,7 +35,6 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="libevent \ - tini \ sudo \ traceroute \ nmap \ @@ -102,7 +101,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 42e379e13..1f38583d0 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -53,7 +53,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -133,7 +132,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 1e3124100..236106c63 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -35,7 +35,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -98,7 +97,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index a31108e9a..2e59c869a 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -44,7 +44,7 @@ The image uses MySQL database. It uses the next procedure to start: Start a Zabbix server container as follows: - docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -d zabbix/zabbix-server-mysql:tag + docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" --init -d zabbix/zabbix-server-mysql:tag Where `some-zabbix-server-mysql` is the name you want to assign to your container, `some-mysql-server` is IP or DNS name of MySQL server, `some-user` is user to connect to Zabbix database on MySQL server, `some-password` is the password to connect to MySQL server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-server-mysql/tags/). @@ -79,7 +79,7 @@ This variable is port of MySQL server. By default, value is '3306'. These variables are used by Zabbix server to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`! ```console -docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -d zabbix/zabbix-server-mysql:tag +docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD --init -d zabbix/zabbix-server-mysql:tag ``` With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! @@ -87,7 +87,7 @@ With Docker Swarm or Kubernetes this works with secrets. That way it is replicat ```console printf "zabbix" | docker secret create MYSQL_USER - printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -d zabbix/zabbix-server-mysql:tag +docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD --init -d zabbix/zabbix-server-mysql:tag ``` This method is also applicable for `MYSQL_ROOT_PASSWORD` with `MYSQL_ROOT_PASSWORD_FILE`. diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index cd3a57646..b2e67f952 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -35,7 +35,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sq RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ fping \ sudo \ traceroute \ @@ -103,7 +102,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 3d215b062..b91a9c657 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -36,7 +36,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sq RUN set -eux && \ REPOLIST="baseos,appstream,crb,epel" && \ INSTALL_PKGS="fping \ - tini \ sudo \ traceroute \ nmap \ @@ -110,7 +109,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index df68299dc..cb23038be 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -37,7 +37,6 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="bash \ fping \ - tini \ sudo \ traceroute \ nmap \ @@ -113,7 +112,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index f1eea0373..70a86c467 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -54,7 +54,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sq RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -142,7 +141,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index fc7dfaf29..655f75df5 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -36,7 +36,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sq RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -108,7 +107,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index b6ebacc53..327f46261 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -43,7 +43,7 @@ The image uses PostgreSQL database. It uses the next procedure to start: Start a Zabbix server container as follows: - docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" -d zabbix/zabbix-server-pgsql:tag + docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER="some-user" -e POSTGRES_PASSWORD="some-password" --init -d zabbix/zabbix-server-pgsql:tag Where `some-zabbix-server-pgsql` is the name you want to assign to your container, `some-postgres-server` is IP or DNS name of PostgreSQL server, `some-user` is user to connect to Zabbix database on PostgreSQL server, `some-password` is the password to connect to PostgreSQL server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-server-pgsql/tags/). @@ -78,7 +78,7 @@ This variable is port of PostgreSQL server. By default, value is '5432'. These variables are used by Zabbix server to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `POSTGRES_USER` or `POSTGRES_USER_FILE`! ```console -docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD -d zabbix/zabbix-server-pgsql:tag +docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -v ./.POSTGRES_USER:/run/secrets/POSTGRES_USER -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -v ./.POSTGRES_PASSWORD:/run/secrets/POSTGRES_PASSWORD -e POSTGRES_PASSWORD_FILE=/var/run/secrets/POSTGRES_PASSWORD --init -d zabbix/zabbix-server-pgsql:tag ``` With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster! @@ -86,7 +86,7 @@ With Docker Swarm or Kubernetes this works with secrets. That way it is replicat ```console printf "zabbix" | docker secret create POSTGRES_USER - printf "zabbix" | docker secret create POSTGRES_PASSWORD - -docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD -d zabbix/zabbix-server-pgsql:tag +docker run --name some-zabbix-server-pgsql -e DB_SERVER_HOST="some-postgres-server" -e POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER -e POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD --init -d zabbix/zabbix-server-pgsql:tag ``` By default, values for `POSTGRES_USER` and `POSTGRES_PASSWORD` are `zabbix`, `zabbix`. diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index f8b02f273..5dbdeac1f 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -36,7 +36,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb RUN set -eux && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -104,7 +103,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 37caefc47..deb4ef533 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -38,7 +38,6 @@ RUN set -eux && \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="fping \ file-libs \ - tini \ sudo \ traceroute \ nmap \ @@ -111,7 +110,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index f4559b765..853f9ae6d 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -38,7 +38,6 @@ COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel RUN set -eux && \ INSTALL_PKGS="fping \ file-libs \ - tini \ sudo \ traceroute \ nmap \ @@ -112,7 +111,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 2eaa35e93..90c00e732 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -37,7 +37,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb RUN set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tini \ sudo \ traceroute \ nmap \ @@ -109,7 +108,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"] COPY ["docker-entrypoint.sh", "/usr/bin/"] -ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"] +ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] USER 1997 diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 230113793..01a0a17b9 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-mysql:alpine-trunk + init: true ports: - "10051:10051" volumes: @@ -68,6 +69,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + init: true profiles: - all ports: @@ -117,6 +119,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:alpine-trunk + init: true profiles: - all ports: @@ -289,6 +292,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:alpine-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 1a5ac343d..4cbfab3f8 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -38,6 +38,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-server-mysql:alpine-local + init: true ports: - "10051:10051" volumes: @@ -111,6 +112,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local + init: true profiles: - all ports: @@ -167,6 +169,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local + init: true profiles: - all ports: @@ -360,6 +363,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-agent:alpine-local + init: true profiles: - full - all diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index dbd729b66..82a1be865 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-pgsql:alpine-trunk + init: true ports: - "10051:10051" volumes: @@ -65,6 +66,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + init: true profiles: - all ports: @@ -114,6 +116,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:alpine-trunk + init: true profiles: - all ports: @@ -280,6 +283,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:alpine-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index bba16e819..aae112ca0 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -52,6 +52,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-server-pgsql:alpine-local + init: true ports: - "10051:10051" volumes: @@ -122,6 +123,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local image: zabbix-proxy-sqlite3:alpine-local + init: true profiles: - all ports: @@ -178,6 +180,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local image: zabbix-proxy-mysql:alpine-local + init: true profiles: - all ports: @@ -365,6 +368,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local image: zabbix-agent:alpine-local + init: true profiles: - full - all diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index dbb8b9f66..95e0d931b 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-mysql:centos-trunk + init: true ports: - "10051:10051" volumes: @@ -68,6 +69,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:centos-trunk + init: true profiles: - all ports: @@ -117,6 +119,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:centos-trunk + init: true profiles: - all ports: @@ -289,6 +292,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:centos-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 48c72c1f5..ce002709e 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -39,6 +39,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-server-mysql:centos-local + init: true ports: - "10051:10051" volumes: @@ -112,6 +113,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:centos-local image: zabbix-proxy-sqlite3:centos-local + init: true profiles: - all ports: @@ -168,6 +170,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-proxy-mysql:centos-local + init: true profiles: - all ports: @@ -361,6 +364,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-agent:centos-local + init: true profiles: - full - all diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 4ff952b67..94ad27b7e 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-pgsql:centos-trunk + init: true ports: - "10051:10051" volumes: @@ -65,6 +66,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:centos-trunk + init: true profiles: - all ports: @@ -114,6 +116,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:centos-trunk + init: true profiles: - all ports: @@ -280,6 +283,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:centos-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 0d3e1e6fe..4d09138db 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -52,6 +52,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-server-pgsql:centos-local + init: true ports: - "10051:10051" volumes: @@ -122,6 +123,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-proxy-sqlite3:centos-local + init: true profiles: - all ports: @@ -178,6 +180,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:centos-local image: zabbix-proxy-mysql:centos-local + init: true profiles: - all ports: @@ -365,6 +368,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:centos-local image: zabbix-agent:centos-local + init: true profiles: - full - all diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index dcee58f39..f4bfe7f26 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-mysql:ol-trunk + init: true ports: - "10051:10051" volumes: @@ -68,6 +69,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ol-trunk + init: true profiles: - all ports: @@ -117,6 +119,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ol-trunk + init: true profiles: - all ports: @@ -289,6 +292,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ol-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 1ba669b5c..37cc9da45 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -39,6 +39,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local image: zabbix-server-mysql:ol-local + init: true ports: - "10051:10051" volumes: @@ -112,6 +113,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:ol-local image: zabbix-proxy-sqlite3:ol-local + init: true profiles: - all ports: @@ -168,6 +170,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local image: zabbix-proxy-mysql:ol-local + init: true profiles: - all ports: @@ -361,6 +364,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local image: zabbix-agent:ol-local + init: true profiles: - full - all diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index b8aa705e9..2a6ba95ed 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-pgsql:ol-trunk + init: true ports: - "10051:10051" volumes: @@ -65,6 +66,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ol-trunk + init: true profiles: - all ports: @@ -114,6 +116,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ol-trunk + init: true profiles: - all ports: @@ -280,6 +283,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ol-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index e6fa3cad7..ee805aab7 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -52,6 +52,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local image: zabbix-server-pgsql:ol-local + init: true ports: - "10051:10051" volumes: @@ -122,6 +123,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:ol-local image: zabbix-proxy-sqlite3:ol-local + init: true profiles: - all ports: @@ -178,6 +180,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ol-local image: zabbix-proxy-mysql:ol-local + init: true profiles: - all ports: @@ -365,6 +368,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ol-local image: zabbix-agent:ol-local + init: true profiles: - full - all diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index 25f7c0151..a69600eb6 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-mysql:ubuntu-trunk + init: true ports: - "10051:10051" volumes: @@ -67,6 +68,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + init: true profiles: - all ports: @@ -115,6 +117,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + init: true profiles: - all ports: @@ -282,6 +285,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index c42d71374..9f2a67560 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -39,6 +39,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-server-mysql:ubuntu-local + init: true ports: - "10051:10051" volumes: @@ -111,6 +112,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:ubuntu-local image: zabbix-proxy-sqlite3:ubuntu-local + init: true profiles: - all ports: @@ -166,6 +168,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-proxy-mysql:ubuntu-local + init: true profiles: - all ports: @@ -356,6 +359,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-agent:ubuntu-local + init: true profiles: - full - all diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index ac4f364bf..2d1cdaeed 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -2,6 +2,7 @@ version: '3.5' services: zabbix-server: image: zabbix/zabbix-server-pgsql:ubuntu-trunk + init: true ports: - "10051:10051" volumes: @@ -64,6 +65,7 @@ services: zabbix-proxy-sqlite3: image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + init: true profiles: - all ports: @@ -112,6 +114,7 @@ services: zabbix-proxy-mysql: image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + init: true profiles: - all ports: @@ -275,6 +278,7 @@ services: zabbix-agent: image: zabbix/zabbix-agent:ubuntu-trunk + init: true profiles: - full - all diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 2b45bcb5b..496bda701 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -52,6 +52,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-server-pgsql:ubuntu-local + init: true ports: - "10051:10051" volumes: @@ -121,6 +122,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:ubuntu-local image: zabbix-proxy-sqlite3:ubuntu-local + init: true profiles: - all ports: @@ -176,6 +178,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-proxy-mysql:ubuntu-local + init: true profiles: - all ports: @@ -360,6 +363,7 @@ services: args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-agent:ubuntu-local + init: true profiles: - full - all