New Dockerfiles and environment variables structure

2024-11-21 23:33:31 +01:00 · 2021-09-15 21:19:29 +02:00 · 2021-09-15 21:19:29 +02:00 · 630d9cb5ac
commit 630d9cb5ac
parent 97108f2e28
347 changed files with 296 additions and 345 deletions
--- a/.github/workflows/dockerhub_description.yml
+++ b/.github/workflows/dockerhub_description.yml
@ -5,7 +5,7 @@ on:
    branches:
      - 'trunk'
    paths:
-      - "*/*/README.md"
+      - "Dockerfiles/*/*/README.md"
  workflow_dispatch:

 jobs:
@ -41,4 +41,4 @@ jobs:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
          repository: ${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }}
-          readme-filepath: ./${{ matrix.build }}/${{ env.SUBDIR }}/README.md
+          readme-filepath: ./Dockerfiles/${{ matrix.build }}/${{ env.SUBDIR }}/README.md
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@ -1,4 +1,4 @@
-name: CI
+name: Images build

 on:
  release:
@ -12,9 +12,9 @@ on:
      - '5.4'
      - 'trunk'
    paths-ignore:
-      - '.env*'
+      - 'env_vars/*'
      - 'docker-compose*.yaml'
-      - '*/rhel/*'
+      - 'Dockerfiles/*/rhel/*'
      - "**.md"

 defaults:
--- a/Dockerfiles/agent/alpine/.dockerignore
+++ b/Dockerfiles/agent/alpine/.dockerignore
--- a/Dockerfiles/agent/alpine/Dockerfile
+++ b/Dockerfiles/agent/alpine/Dockerfile
--- a/Dockerfiles/agent/alpine/README.md
+++ b/Dockerfiles/agent/alpine/README.md
--- a/Dockerfiles/agent/alpine/build.sh
+++ b/Dockerfiles/agent/alpine/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/agent/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/agent/alpine/docker-entrypoint.sh
--- a/Dockerfiles/agent/alpine/hooks/build
+++ b/Dockerfiles/agent/alpine/hooks/build
--- a/Dockerfiles/agent/centos/.dockerignore
+++ b/Dockerfiles/agent/centos/.dockerignore
--- a/Dockerfiles/agent/centos/Dockerfile
+++ b/Dockerfiles/agent/centos/Dockerfile
--- a/Dockerfiles/agent/centos/README.md
+++ b/Dockerfiles/agent/centos/README.md
--- a/Dockerfiles/agent/centos/build.sh
+++ b/Dockerfiles/agent/centos/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/agent/centos/docker-entrypoint.sh
+++ b/Dockerfiles/agent/centos/docker-entrypoint.sh
--- a/Dockerfiles/agent/centos/hooks/build
+++ b/Dockerfiles/agent/centos/hooks/build
--- a/Dockerfiles/agent/ubuntu/.dockerignore
+++ b/Dockerfiles/agent/ubuntu/.dockerignore
--- a/Dockerfiles/agent/ubuntu/Dockerfile
+++ b/Dockerfiles/agent/ubuntu/Dockerfile
--- a/Dockerfiles/agent/ubuntu/README.md
+++ b/Dockerfiles/agent/ubuntu/README.md
--- a/Dockerfiles/agent/ubuntu/build.sh
+++ b/Dockerfiles/agent/ubuntu/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/agent/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/agent/ubuntu/docker-entrypoint.sh
--- a/Dockerfiles/agent/ubuntu/hooks/build
+++ b/Dockerfiles/agent/ubuntu/hooks/build
--- a/Dockerfiles/java-gateway/alpine/.dockerignore
+++ b/Dockerfiles/java-gateway/alpine/.dockerignore
--- a/Dockerfiles/java-gateway/alpine/Dockerfile
+++ b/Dockerfiles/java-gateway/alpine/Dockerfile
--- a/Dockerfiles/java-gateway/alpine/README.md
+++ b/Dockerfiles/java-gateway/alpine/README.md
--- a/Dockerfiles/java-gateway/alpine/build.sh
+++ b/Dockerfiles/java-gateway/alpine/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/java-gateway/alpine/conf/usr/sbin/zabbix_java_gateway
+++ b/Dockerfiles/java-gateway/alpine/conf/usr/sbin/zabbix_java_gateway
--- a/Dockerfiles/java-gateway/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/java-gateway/alpine/docker-entrypoint.sh
--- a/Dockerfiles/java-gateway/centos/.dockerignore
+++ b/Dockerfiles/java-gateway/centos/.dockerignore
--- a/Dockerfiles/java-gateway/centos/Dockerfile
+++ b/Dockerfiles/java-gateway/centos/Dockerfile
--- a/Dockerfiles/java-gateway/centos/README.md
+++ b/Dockerfiles/java-gateway/centos/README.md
--- a/Dockerfiles/java-gateway/centos/build.sh
+++ b/Dockerfiles/java-gateway/centos/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/java-gateway/centos/conf/usr/sbin/zabbix_java_gateway
+++ b/Dockerfiles/java-gateway/centos/conf/usr/sbin/zabbix_java_gateway
--- a/Dockerfiles/java-gateway/centos/docker-entrypoint.sh
+++ b/Dockerfiles/java-gateway/centos/docker-entrypoint.sh
--- a/Dockerfiles/java-gateway/ubuntu/.dockerignore
+++ b/Dockerfiles/java-gateway/ubuntu/.dockerignore
--- a/Dockerfiles/java-gateway/ubuntu/Dockerfile
+++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile
--- a/Dockerfiles/java-gateway/ubuntu/README.md
+++ b/Dockerfiles/java-gateway/ubuntu/README.md
--- a/Dockerfiles/java-gateway/ubuntu/build.sh
+++ b/Dockerfiles/java-gateway/ubuntu/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/java-gateway/ubuntu/conf/usr/sbin/zabbix_java_gateway
+++ b/Dockerfiles/java-gateway/ubuntu/conf/usr/sbin/zabbix_java_gateway
--- a/Dockerfiles/java-gateway/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/java-gateway/ubuntu/docker-entrypoint.sh
--- a/Dockerfiles/proxy-mysql/alpine/.dockerignore
+++ b/Dockerfiles/proxy-mysql/alpine/.dockerignore
--- a/Dockerfiles/proxy-mysql/alpine/Dockerfile
+++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile
--- a/Dockerfiles/proxy-mysql/alpine/README.md
+++ b/Dockerfiles/proxy-mysql/alpine/README.md
--- a/Dockerfiles/proxy-mysql/alpine/build.sh
+++ b/Dockerfiles/proxy-mysql/alpine/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
--- a/Dockerfiles/proxy-mysql/centos/.dockerignore
+++ b/Dockerfiles/proxy-mysql/centos/.dockerignore
--- a/Dockerfiles/proxy-mysql/centos/Dockerfile
+++ b/Dockerfiles/proxy-mysql/centos/Dockerfile
--- a/Dockerfiles/proxy-mysql/centos/README.md
+++ b/Dockerfiles/proxy-mysql/centos/README.md
--- a/Dockerfiles/proxy-mysql/centos/build.sh
+++ b/Dockerfiles/proxy-mysql/centos/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
--- a/Dockerfiles/proxy-mysql/ubuntu/.dockerignore
+++ b/Dockerfiles/proxy-mysql/ubuntu/.dockerignore
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
--- a/Dockerfiles/proxy-mysql/ubuntu/README.md
+++ b/Dockerfiles/proxy-mysql/ubuntu/README.md
--- a/Dockerfiles/proxy-mysql/ubuntu/build.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
--- a/Dockerfiles/proxy-sqlite3/alpine/.dockerignore
+++ b/Dockerfiles/proxy-sqlite3/alpine/.dockerignore
--- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
--- a/Dockerfiles/proxy-sqlite3/alpine/README.md
+++ b/Dockerfiles/proxy-sqlite3/alpine/README.md
--- a/Dockerfiles/proxy-sqlite3/alpine/build.sh
+++ b/Dockerfiles/proxy-sqlite3/alpine/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh
--- a/Dockerfiles/proxy-sqlite3/centos/.dockerignore
+++ b/Dockerfiles/proxy-sqlite3/centos/.dockerignore
--- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
--- a/Dockerfiles/proxy-sqlite3/centos/README.md
+++ b/Dockerfiles/proxy-sqlite3/centos/README.md
--- a/Dockerfiles/proxy-sqlite3/centos/build.sh
+++ b/Dockerfiles/proxy-sqlite3/centos/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh
--- a/Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore
--- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
--- a/Dockerfiles/proxy-sqlite3/ubuntu/README.md
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/README.md
--- a/Dockerfiles/proxy-sqlite3/ubuntu/build.sh
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh
--- a/Dockerfiles/server-mysql/alpine/.dockerignore
+++ b/Dockerfiles/server-mysql/alpine/.dockerignore
--- a/Dockerfiles/server-mysql/alpine/Dockerfile
+++ b/Dockerfiles/server-mysql/alpine/Dockerfile
--- a/Dockerfiles/server-mysql/alpine/README.md
+++ b/Dockerfiles/server-mysql/alpine/README.md
--- a/Dockerfiles/server-mysql/alpine/build.sh
+++ b/Dockerfiles/server-mysql/alpine/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
--- a/Dockerfiles/server-mysql/centos/.dockerignore
+++ b/Dockerfiles/server-mysql/centos/.dockerignore
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
--- a/Dockerfiles/server-mysql/centos/README.md
+++ b/Dockerfiles/server-mysql/centos/README.md
--- a/Dockerfiles/server-mysql/centos/build.sh
+++ b/Dockerfiles/server-mysql/centos/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
--- a/Dockerfiles/server-mysql/ubuntu/.dockerignore
+++ b/Dockerfiles/server-mysql/ubuntu/.dockerignore
--- a/Dockerfiles/server-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile
--- a/Dockerfiles/server-mysql/ubuntu/README.md
+++ b/Dockerfiles/server-mysql/ubuntu/README.md
--- a/Dockerfiles/server-mysql/ubuntu/build.sh
+++ b/Dockerfiles/server-mysql/ubuntu/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
--- a/Dockerfiles/server-pgsql/alpine/.dockerignore
+++ b/Dockerfiles/server-pgsql/alpine/.dockerignore
--- a/Dockerfiles/server-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/server-pgsql/alpine/Dockerfile
--- a/Dockerfiles/server-pgsql/alpine/README.md
+++ b/Dockerfiles/server-pgsql/alpine/README.md
--- a/Dockerfiles/server-pgsql/alpine/build.sh
+++ b/Dockerfiles/server-pgsql/alpine/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
--- a/Dockerfiles/server-pgsql/centos/.dockerignore
+++ b/Dockerfiles/server-pgsql/centos/.dockerignore
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
--- a/Dockerfiles/server-pgsql/centos/README.md
+++ b/Dockerfiles/server-pgsql/centos/README.md
--- a/Dockerfiles/server-pgsql/centos/build.sh
+++ b/Dockerfiles/server-pgsql/centos/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
--- a/Dockerfiles/server-pgsql/ubuntu/.dockerignore
+++ b/Dockerfiles/server-pgsql/ubuntu/.dockerignore
--- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
--- a/Dockerfiles/server-pgsql/ubuntu/README.md
+++ b/Dockerfiles/server-pgsql/ubuntu/README.md
--- a/Dockerfiles/server-pgsql/ubuntu/build.sh
+++ b/Dockerfiles/server-pgsql/ubuntu/build.sh
@ -0,0 +1 @@
+../../../build.sh
--- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
--- a/Dockerfiles/snmptraps/alpine/.dockerignore
+++ b/Dockerfiles/snmptraps/alpine/.dockerignore
--- a/Dockerfiles/snmptraps/alpine/Dockerfile
+++ b/Dockerfiles/snmptraps/alpine/Dockerfile
--- a/Show More
+++ b/Show More