diff --git a/.github/workflows/dockerhub_description.yml b/.github/workflows/dockerhub_description.yml index a64eb4110..e6fb33ba3 100644 --- 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 diff --git a/.github/workflows/CI.yml b/.github/workflows/images_build.yml similarity index 98% rename from .github/workflows/CI.yml rename to .github/workflows/images_build.yml index 54fce93a8..03964080e 100644 --- a/.github/workflows/CI.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: diff --git a/agent/alpine/.dockerignore b/Dockerfiles/agent/alpine/.dockerignore similarity index 100% rename from agent/alpine/.dockerignore rename to Dockerfiles/agent/alpine/.dockerignore diff --git a/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile similarity index 100% rename from agent/alpine/Dockerfile rename to Dockerfiles/agent/alpine/Dockerfile diff --git a/agent/alpine/README.md b/Dockerfiles/agent/alpine/README.md similarity index 100% rename from agent/alpine/README.md rename to Dockerfiles/agent/alpine/README.md diff --git a/Dockerfiles/agent/alpine/build.sh b/Dockerfiles/agent/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent/alpine/docker-entrypoint.sh b/Dockerfiles/agent/alpine/docker-entrypoint.sh similarity index 100% rename from agent/alpine/docker-entrypoint.sh rename to Dockerfiles/agent/alpine/docker-entrypoint.sh diff --git a/agent/alpine/hooks/build b/Dockerfiles/agent/alpine/hooks/build similarity index 100% rename from agent/alpine/hooks/build rename to Dockerfiles/agent/alpine/hooks/build diff --git a/agent/centos/.dockerignore b/Dockerfiles/agent/centos/.dockerignore similarity index 100% rename from agent/centos/.dockerignore rename to Dockerfiles/agent/centos/.dockerignore diff --git a/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile similarity index 100% rename from agent/centos/Dockerfile rename to Dockerfiles/agent/centos/Dockerfile diff --git a/agent/centos/README.md b/Dockerfiles/agent/centos/README.md similarity index 100% rename from agent/centos/README.md rename to Dockerfiles/agent/centos/README.md diff --git a/Dockerfiles/agent/centos/build.sh b/Dockerfiles/agent/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent/centos/docker-entrypoint.sh b/Dockerfiles/agent/centos/docker-entrypoint.sh similarity index 100% rename from agent/centos/docker-entrypoint.sh rename to Dockerfiles/agent/centos/docker-entrypoint.sh diff --git a/agent/centos/hooks/build b/Dockerfiles/agent/centos/hooks/build similarity index 100% rename from agent/centos/hooks/build rename to Dockerfiles/agent/centos/hooks/build diff --git a/agent/ubuntu/.dockerignore b/Dockerfiles/agent/ubuntu/.dockerignore similarity index 100% rename from agent/ubuntu/.dockerignore rename to Dockerfiles/agent/ubuntu/.dockerignore diff --git a/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile similarity index 100% rename from agent/ubuntu/Dockerfile rename to Dockerfiles/agent/ubuntu/Dockerfile diff --git a/agent/ubuntu/README.md b/Dockerfiles/agent/ubuntu/README.md similarity index 100% rename from agent/ubuntu/README.md rename to Dockerfiles/agent/ubuntu/README.md diff --git a/Dockerfiles/agent/ubuntu/build.sh b/Dockerfiles/agent/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent/ubuntu/docker-entrypoint.sh b/Dockerfiles/agent/ubuntu/docker-entrypoint.sh similarity index 100% rename from agent/ubuntu/docker-entrypoint.sh rename to Dockerfiles/agent/ubuntu/docker-entrypoint.sh diff --git a/agent/ubuntu/hooks/build b/Dockerfiles/agent/ubuntu/hooks/build similarity index 100% rename from agent/ubuntu/hooks/build rename to Dockerfiles/agent/ubuntu/hooks/build diff --git a/java-gateway/alpine/.dockerignore b/Dockerfiles/java-gateway/alpine/.dockerignore similarity index 100% rename from java-gateway/alpine/.dockerignore rename to Dockerfiles/java-gateway/alpine/.dockerignore diff --git a/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile similarity index 100% rename from java-gateway/alpine/Dockerfile rename to Dockerfiles/java-gateway/alpine/Dockerfile diff --git a/java-gateway/alpine/README.md b/Dockerfiles/java-gateway/alpine/README.md similarity index 100% rename from java-gateway/alpine/README.md rename to Dockerfiles/java-gateway/alpine/README.md diff --git a/Dockerfiles/java-gateway/alpine/build.sh b/Dockerfiles/java-gateway/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/java-gateway/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/java-gateway/alpine/conf/usr/sbin/zabbix_java_gateway b/Dockerfiles/java-gateway/alpine/conf/usr/sbin/zabbix_java_gateway similarity index 100% rename from java-gateway/alpine/conf/usr/sbin/zabbix_java_gateway rename to Dockerfiles/java-gateway/alpine/conf/usr/sbin/zabbix_java_gateway diff --git a/java-gateway/alpine/docker-entrypoint.sh b/Dockerfiles/java-gateway/alpine/docker-entrypoint.sh similarity index 100% rename from java-gateway/alpine/docker-entrypoint.sh rename to Dockerfiles/java-gateway/alpine/docker-entrypoint.sh diff --git a/java-gateway/centos/.dockerignore b/Dockerfiles/java-gateway/centos/.dockerignore similarity index 100% rename from java-gateway/centos/.dockerignore rename to Dockerfiles/java-gateway/centos/.dockerignore diff --git a/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile similarity index 100% rename from java-gateway/centos/Dockerfile rename to Dockerfiles/java-gateway/centos/Dockerfile diff --git a/java-gateway/centos/README.md b/Dockerfiles/java-gateway/centos/README.md similarity index 100% rename from java-gateway/centos/README.md rename to Dockerfiles/java-gateway/centos/README.md diff --git a/Dockerfiles/java-gateway/centos/build.sh b/Dockerfiles/java-gateway/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/java-gateway/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/java-gateway/centos/conf/usr/sbin/zabbix_java_gateway b/Dockerfiles/java-gateway/centos/conf/usr/sbin/zabbix_java_gateway similarity index 100% rename from java-gateway/centos/conf/usr/sbin/zabbix_java_gateway rename to Dockerfiles/java-gateway/centos/conf/usr/sbin/zabbix_java_gateway diff --git a/java-gateway/centos/docker-entrypoint.sh b/Dockerfiles/java-gateway/centos/docker-entrypoint.sh similarity index 100% rename from java-gateway/centos/docker-entrypoint.sh rename to Dockerfiles/java-gateway/centos/docker-entrypoint.sh diff --git a/java-gateway/ubuntu/.dockerignore b/Dockerfiles/java-gateway/ubuntu/.dockerignore similarity index 100% rename from java-gateway/ubuntu/.dockerignore rename to Dockerfiles/java-gateway/ubuntu/.dockerignore diff --git a/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile similarity index 100% rename from java-gateway/ubuntu/Dockerfile rename to Dockerfiles/java-gateway/ubuntu/Dockerfile diff --git a/java-gateway/ubuntu/README.md b/Dockerfiles/java-gateway/ubuntu/README.md similarity index 100% rename from java-gateway/ubuntu/README.md rename to Dockerfiles/java-gateway/ubuntu/README.md diff --git a/Dockerfiles/java-gateway/ubuntu/build.sh b/Dockerfiles/java-gateway/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/java-gateway/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/java-gateway/ubuntu/conf/usr/sbin/zabbix_java_gateway b/Dockerfiles/java-gateway/ubuntu/conf/usr/sbin/zabbix_java_gateway similarity index 100% rename from java-gateway/ubuntu/conf/usr/sbin/zabbix_java_gateway rename to Dockerfiles/java-gateway/ubuntu/conf/usr/sbin/zabbix_java_gateway diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/Dockerfiles/java-gateway/ubuntu/docker-entrypoint.sh similarity index 100% rename from java-gateway/ubuntu/docker-entrypoint.sh rename to Dockerfiles/java-gateway/ubuntu/docker-entrypoint.sh diff --git a/proxy-mysql/alpine/.dockerignore b/Dockerfiles/proxy-mysql/alpine/.dockerignore similarity index 100% rename from proxy-mysql/alpine/.dockerignore rename to Dockerfiles/proxy-mysql/alpine/.dockerignore diff --git a/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile similarity index 100% rename from proxy-mysql/alpine/Dockerfile rename to Dockerfiles/proxy-mysql/alpine/Dockerfile diff --git a/proxy-mysql/alpine/README.md b/Dockerfiles/proxy-mysql/alpine/README.md similarity index 100% rename from proxy-mysql/alpine/README.md rename to Dockerfiles/proxy-mysql/alpine/README.md diff --git a/Dockerfiles/proxy-mysql/alpine/build.sh b/Dockerfiles/proxy-mysql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh similarity index 100% rename from proxy-mysql/alpine/docker-entrypoint.sh rename to Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh diff --git a/proxy-mysql/centos/.dockerignore b/Dockerfiles/proxy-mysql/centos/.dockerignore similarity index 100% rename from proxy-mysql/centos/.dockerignore rename to Dockerfiles/proxy-mysql/centos/.dockerignore diff --git a/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile similarity index 100% rename from proxy-mysql/centos/Dockerfile rename to Dockerfiles/proxy-mysql/centos/Dockerfile diff --git a/proxy-mysql/centos/README.md b/Dockerfiles/proxy-mysql/centos/README.md similarity index 100% rename from proxy-mysql/centos/README.md rename to Dockerfiles/proxy-mysql/centos/README.md diff --git a/Dockerfiles/proxy-mysql/centos/build.sh b/Dockerfiles/proxy-mysql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-mysql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh similarity index 100% rename from proxy-mysql/centos/docker-entrypoint.sh rename to Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh diff --git a/proxy-mysql/ubuntu/.dockerignore b/Dockerfiles/proxy-mysql/ubuntu/.dockerignore similarity index 100% rename from proxy-mysql/ubuntu/.dockerignore rename to Dockerfiles/proxy-mysql/ubuntu/.dockerignore diff --git a/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile similarity index 100% rename from proxy-mysql/ubuntu/Dockerfile rename to Dockerfiles/proxy-mysql/ubuntu/Dockerfile diff --git a/proxy-mysql/ubuntu/README.md b/Dockerfiles/proxy-mysql/ubuntu/README.md similarity index 100% rename from proxy-mysql/ubuntu/README.md rename to Dockerfiles/proxy-mysql/ubuntu/README.md diff --git a/Dockerfiles/proxy-mysql/ubuntu/build.sh b/Dockerfiles/proxy-mysql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh similarity index 100% rename from proxy-mysql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh diff --git a/proxy-sqlite3/alpine/.dockerignore b/Dockerfiles/proxy-sqlite3/alpine/.dockerignore similarity index 100% rename from proxy-sqlite3/alpine/.dockerignore rename to Dockerfiles/proxy-sqlite3/alpine/.dockerignore diff --git a/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile similarity index 100% rename from proxy-sqlite3/alpine/Dockerfile rename to Dockerfiles/proxy-sqlite3/alpine/Dockerfile diff --git a/proxy-sqlite3/alpine/README.md b/Dockerfiles/proxy-sqlite3/alpine/README.md similarity index 100% rename from proxy-sqlite3/alpine/README.md rename to Dockerfiles/proxy-sqlite3/alpine/README.md diff --git a/Dockerfiles/proxy-sqlite3/alpine/build.sh b/Dockerfiles/proxy-sqlite3/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-sqlite3/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh similarity index 100% rename from proxy-sqlite3/alpine/docker-entrypoint.sh rename to Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh diff --git a/proxy-sqlite3/centos/.dockerignore b/Dockerfiles/proxy-sqlite3/centos/.dockerignore similarity index 100% rename from proxy-sqlite3/centos/.dockerignore rename to Dockerfiles/proxy-sqlite3/centos/.dockerignore diff --git a/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile similarity index 100% rename from proxy-sqlite3/centos/Dockerfile rename to Dockerfiles/proxy-sqlite3/centos/Dockerfile diff --git a/proxy-sqlite3/centos/README.md b/Dockerfiles/proxy-sqlite3/centos/README.md similarity index 100% rename from proxy-sqlite3/centos/README.md rename to Dockerfiles/proxy-sqlite3/centos/README.md diff --git a/Dockerfiles/proxy-sqlite3/centos/build.sh b/Dockerfiles/proxy-sqlite3/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-sqlite3/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh similarity index 100% rename from proxy-sqlite3/centos/docker-entrypoint.sh rename to Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh diff --git a/proxy-sqlite3/ubuntu/.dockerignore b/Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore similarity index 100% rename from proxy-sqlite3/ubuntu/.dockerignore rename to Dockerfiles/proxy-sqlite3/ubuntu/.dockerignore diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile similarity index 100% rename from proxy-sqlite3/ubuntu/Dockerfile rename to Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile diff --git a/proxy-sqlite3/ubuntu/README.md b/Dockerfiles/proxy-sqlite3/ubuntu/README.md similarity index 100% rename from proxy-sqlite3/ubuntu/README.md rename to Dockerfiles/proxy-sqlite3/ubuntu/README.md diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/build.sh b/Dockerfiles/proxy-sqlite3/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-sqlite3/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh similarity index 100% rename from proxy-sqlite3/ubuntu/docker-entrypoint.sh rename to Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh diff --git a/server-mysql/alpine/.dockerignore b/Dockerfiles/server-mysql/alpine/.dockerignore similarity index 100% rename from server-mysql/alpine/.dockerignore rename to Dockerfiles/server-mysql/alpine/.dockerignore diff --git a/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile similarity index 100% rename from server-mysql/alpine/Dockerfile rename to Dockerfiles/server-mysql/alpine/Dockerfile diff --git a/server-mysql/alpine/README.md b/Dockerfiles/server-mysql/alpine/README.md similarity index 100% rename from server-mysql/alpine/README.md rename to Dockerfiles/server-mysql/alpine/README.md diff --git a/Dockerfiles/server-mysql/alpine/build.sh b/Dockerfiles/server-mysql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh similarity index 100% rename from server-mysql/alpine/docker-entrypoint.sh rename to Dockerfiles/server-mysql/alpine/docker-entrypoint.sh diff --git a/server-mysql/centos/.dockerignore b/Dockerfiles/server-mysql/centos/.dockerignore similarity index 100% rename from server-mysql/centos/.dockerignore rename to Dockerfiles/server-mysql/centos/.dockerignore diff --git a/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile similarity index 100% rename from server-mysql/centos/Dockerfile rename to Dockerfiles/server-mysql/centos/Dockerfile diff --git a/server-mysql/centos/README.md b/Dockerfiles/server-mysql/centos/README.md similarity index 100% rename from server-mysql/centos/README.md rename to Dockerfiles/server-mysql/centos/README.md diff --git a/Dockerfiles/server-mysql/centos/build.sh b/Dockerfiles/server-mysql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-mysql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh similarity index 100% rename from server-mysql/centos/docker-entrypoint.sh rename to Dockerfiles/server-mysql/centos/docker-entrypoint.sh diff --git a/server-mysql/ubuntu/.dockerignore b/Dockerfiles/server-mysql/ubuntu/.dockerignore similarity index 100% rename from server-mysql/ubuntu/.dockerignore rename to Dockerfiles/server-mysql/ubuntu/.dockerignore diff --git a/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile similarity index 100% rename from server-mysql/ubuntu/Dockerfile rename to Dockerfiles/server-mysql/ubuntu/Dockerfile diff --git a/server-mysql/ubuntu/README.md b/Dockerfiles/server-mysql/ubuntu/README.md similarity index 100% rename from server-mysql/ubuntu/README.md rename to Dockerfiles/server-mysql/ubuntu/README.md diff --git a/Dockerfiles/server-mysql/ubuntu/build.sh b/Dockerfiles/server-mysql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh similarity index 100% rename from server-mysql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh diff --git a/server-pgsql/alpine/.dockerignore b/Dockerfiles/server-pgsql/alpine/.dockerignore similarity index 100% rename from server-pgsql/alpine/.dockerignore rename to Dockerfiles/server-pgsql/alpine/.dockerignore diff --git a/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile similarity index 100% rename from server-pgsql/alpine/Dockerfile rename to Dockerfiles/server-pgsql/alpine/Dockerfile diff --git a/server-pgsql/alpine/README.md b/Dockerfiles/server-pgsql/alpine/README.md similarity index 100% rename from server-pgsql/alpine/README.md rename to Dockerfiles/server-pgsql/alpine/README.md diff --git a/Dockerfiles/server-pgsql/alpine/build.sh b/Dockerfiles/server-pgsql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh similarity index 100% rename from server-pgsql/alpine/docker-entrypoint.sh rename to Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh diff --git a/server-pgsql/centos/.dockerignore b/Dockerfiles/server-pgsql/centos/.dockerignore similarity index 100% rename from server-pgsql/centos/.dockerignore rename to Dockerfiles/server-pgsql/centos/.dockerignore diff --git a/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile similarity index 100% rename from server-pgsql/centos/Dockerfile rename to Dockerfiles/server-pgsql/centos/Dockerfile diff --git a/server-pgsql/centos/README.md b/Dockerfiles/server-pgsql/centos/README.md similarity index 100% rename from server-pgsql/centos/README.md rename to Dockerfiles/server-pgsql/centos/README.md diff --git a/Dockerfiles/server-pgsql/centos/build.sh b/Dockerfiles/server-pgsql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-pgsql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh similarity index 100% rename from server-pgsql/centos/docker-entrypoint.sh rename to Dockerfiles/server-pgsql/centos/docker-entrypoint.sh diff --git a/server-pgsql/ubuntu/.dockerignore b/Dockerfiles/server-pgsql/ubuntu/.dockerignore similarity index 100% rename from server-pgsql/ubuntu/.dockerignore rename to Dockerfiles/server-pgsql/ubuntu/.dockerignore diff --git a/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile similarity index 100% rename from server-pgsql/ubuntu/Dockerfile rename to Dockerfiles/server-pgsql/ubuntu/Dockerfile diff --git a/server-pgsql/ubuntu/README.md b/Dockerfiles/server-pgsql/ubuntu/README.md similarity index 100% rename from server-pgsql/ubuntu/README.md rename to Dockerfiles/server-pgsql/ubuntu/README.md diff --git a/Dockerfiles/server-pgsql/ubuntu/build.sh b/Dockerfiles/server-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh similarity index 100% rename from server-pgsql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh diff --git a/snmptraps/alpine/.dockerignore b/Dockerfiles/snmptraps/alpine/.dockerignore similarity index 100% rename from snmptraps/alpine/.dockerignore rename to Dockerfiles/snmptraps/alpine/.dockerignore diff --git a/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile similarity index 100% rename from snmptraps/alpine/Dockerfile rename to Dockerfiles/snmptraps/alpine/Dockerfile diff --git a/snmptraps/alpine/README.md b/Dockerfiles/snmptraps/alpine/README.md similarity index 100% rename from snmptraps/alpine/README.md rename to Dockerfiles/snmptraps/alpine/README.md diff --git a/Dockerfiles/snmptraps/alpine/build.sh b/Dockerfiles/snmptraps/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/snmptraps/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps similarity index 100% rename from snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps rename to Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps diff --git a/snmptraps/alpine/conf/etc/snmp/snmptrapd.conf b/Dockerfiles/snmptraps/alpine/conf/etc/snmp/snmptrapd.conf similarity index 100% rename from snmptraps/alpine/conf/etc/snmp/snmptrapd.conf rename to Dockerfiles/snmptraps/alpine/conf/etc/snmp/snmptrapd.conf diff --git a/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh b/Dockerfiles/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh similarity index 100% rename from snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh rename to Dockerfiles/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh diff --git a/snmptraps/centos/.dockerignore b/Dockerfiles/snmptraps/centos/.dockerignore similarity index 100% rename from snmptraps/centos/.dockerignore rename to Dockerfiles/snmptraps/centos/.dockerignore diff --git a/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile similarity index 100% rename from snmptraps/centos/Dockerfile rename to Dockerfiles/snmptraps/centos/Dockerfile diff --git a/snmptraps/centos/README.md b/Dockerfiles/snmptraps/centos/README.md similarity index 100% rename from snmptraps/centos/README.md rename to Dockerfiles/snmptraps/centos/README.md diff --git a/Dockerfiles/snmptraps/centos/build.sh b/Dockerfiles/snmptraps/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/snmptraps/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps similarity index 100% rename from snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps rename to Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps diff --git a/snmptraps/centos/conf/etc/snmp/snmptrapd.conf b/Dockerfiles/snmptraps/centos/conf/etc/snmp/snmptrapd.conf similarity index 100% rename from snmptraps/centos/conf/etc/snmp/snmptrapd.conf rename to Dockerfiles/snmptraps/centos/conf/etc/snmp/snmptrapd.conf diff --git a/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh b/Dockerfiles/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh similarity index 100% rename from snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh rename to Dockerfiles/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh diff --git a/snmptraps/ubuntu/.dockerignore b/Dockerfiles/snmptraps/ubuntu/.dockerignore similarity index 100% rename from snmptraps/ubuntu/.dockerignore rename to Dockerfiles/snmptraps/ubuntu/.dockerignore diff --git a/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile similarity index 100% rename from snmptraps/ubuntu/Dockerfile rename to Dockerfiles/snmptraps/ubuntu/Dockerfile diff --git a/snmptraps/ubuntu/README.md b/Dockerfiles/snmptraps/ubuntu/README.md similarity index 100% rename from snmptraps/ubuntu/README.md rename to Dockerfiles/snmptraps/ubuntu/README.md diff --git a/Dockerfiles/snmptraps/ubuntu/build.sh b/Dockerfiles/snmptraps/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/snmptraps/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps similarity index 100% rename from snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps rename to Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps diff --git a/snmptraps/ubuntu/conf/etc/snmp/snmptrapd.conf b/Dockerfiles/snmptraps/ubuntu/conf/etc/snmp/snmptrapd.conf similarity index 100% rename from snmptraps/ubuntu/conf/etc/snmp/snmptrapd.conf rename to Dockerfiles/snmptraps/ubuntu/conf/etc/snmp/snmptrapd.conf diff --git a/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh b/Dockerfiles/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh similarity index 100% rename from snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh rename to Dockerfiles/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh diff --git a/web-apache-mysql/alpine/.dockerignore b/Dockerfiles/web-apache-mysql/alpine/.dockerignore similarity index 100% rename from web-apache-mysql/alpine/.dockerignore rename to Dockerfiles/web-apache-mysql/alpine/.dockerignore diff --git a/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile similarity index 100% rename from web-apache-mysql/alpine/Dockerfile rename to Dockerfiles/web-apache-mysql/alpine/Dockerfile diff --git a/web-apache-mysql/alpine/README.md b/Dockerfiles/web-apache-mysql/alpine/README.md similarity index 100% rename from web-apache-mysql/alpine/README.md rename to Dockerfiles/web-apache-mysql/alpine/README.md diff --git a/Dockerfiles/web-apache-mysql/alpine/build.sh b/Dockerfiles/web-apache-mysql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini similarity index 100% rename from web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-mysql/alpine/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh similarity index 100% rename from web-apache-mysql/alpine/docker-entrypoint.sh rename to Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh diff --git a/web-apache-mysql/centos/.dockerignore b/Dockerfiles/web-apache-mysql/centos/.dockerignore similarity index 100% rename from web-apache-mysql/centos/.dockerignore rename to Dockerfiles/web-apache-mysql/centos/.dockerignore diff --git a/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile similarity index 100% rename from web-apache-mysql/centos/Dockerfile rename to Dockerfiles/web-apache-mysql/centos/Dockerfile diff --git a/web-apache-mysql/centos/README.md b/Dockerfiles/web-apache-mysql/centos/README.md similarity index 100% rename from web-apache-mysql/centos/README.md rename to Dockerfiles/web-apache-mysql/centos/README.md diff --git a/Dockerfiles/web-apache-mysql/centos/build.sh b/Dockerfiles/web-apache-mysql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-mysql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf diff --git a/web-apache-mysql/centos/conf/etc/php.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/centos/conf/etc/php.d/99-zabbix.ini similarity index 100% rename from web-apache-mysql/centos/conf/etc/php.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/centos/conf/etc/php.d/99-zabbix.ini diff --git a/web-apache-mysql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf diff --git a/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh similarity index 100% rename from web-apache-mysql/centos/docker-entrypoint.sh rename to Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh diff --git a/web-apache-mysql/ubuntu/.dockerignore b/Dockerfiles/web-apache-mysql/ubuntu/.dockerignore similarity index 100% rename from web-apache-mysql/ubuntu/.dockerignore rename to Dockerfiles/web-apache-mysql/ubuntu/.dockerignore diff --git a/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile similarity index 100% rename from web-apache-mysql/ubuntu/Dockerfile rename to Dockerfiles/web-apache-mysql/ubuntu/Dockerfile diff --git a/web-apache-mysql/ubuntu/README.md b/Dockerfiles/web-apache-mysql/ubuntu/README.md similarity index 100% rename from web-apache-mysql/ubuntu/README.md rename to Dockerfiles/web-apache-mysql/ubuntu/README.md diff --git a/Dockerfiles/web-apache-mysql/ubuntu/build.sh b/Dockerfiles/web-apache-mysql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini similarity index 100% rename from web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh similarity index 100% rename from web-apache-mysql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh diff --git a/web-apache-pgsql/alpine/.dockerignore b/Dockerfiles/web-apache-pgsql/alpine/.dockerignore similarity index 100% rename from web-apache-pgsql/alpine/.dockerignore rename to Dockerfiles/web-apache-pgsql/alpine/.dockerignore diff --git a/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile similarity index 100% rename from web-apache-pgsql/alpine/Dockerfile rename to Dockerfiles/web-apache-pgsql/alpine/Dockerfile diff --git a/web-apache-pgsql/alpine/README.md b/Dockerfiles/web-apache-pgsql/alpine/README.md similarity index 100% rename from web-apache-pgsql/alpine/README.md rename to Dockerfiles/web-apache-pgsql/alpine/README.md diff --git a/Dockerfiles/web-apache-pgsql/alpine/build.sh b/Dockerfiles/web-apache-pgsql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini similarity index 100% rename from web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini diff --git a/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf diff --git a/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh similarity index 100% rename from web-apache-pgsql/alpine/docker-entrypoint.sh rename to Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh diff --git a/web-apache-pgsql/centos/.dockerignore b/Dockerfiles/web-apache-pgsql/centos/.dockerignore similarity index 100% rename from web-apache-pgsql/centos/.dockerignore rename to Dockerfiles/web-apache-pgsql/centos/.dockerignore diff --git a/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile similarity index 100% rename from web-apache-pgsql/centos/Dockerfile rename to Dockerfiles/web-apache-pgsql/centos/Dockerfile diff --git a/web-apache-pgsql/centos/README.md b/Dockerfiles/web-apache-pgsql/centos/README.md similarity index 100% rename from web-apache-pgsql/centos/README.md rename to Dockerfiles/web-apache-pgsql/centos/README.md diff --git a/Dockerfiles/web-apache-pgsql/centos/build.sh b/Dockerfiles/web-apache-pgsql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-pgsql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf diff --git a/web-apache-pgsql/centos/conf/etc/php.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php.d/99-zabbix.ini similarity index 100% rename from web-apache-pgsql/centos/conf/etc/php.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/php.d/99-zabbix.ini diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh similarity index 100% rename from web-apache-pgsql/centos/docker-entrypoint.sh rename to Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh diff --git a/web-apache-pgsql/ubuntu/.dockerignore b/Dockerfiles/web-apache-pgsql/ubuntu/.dockerignore similarity index 100% rename from web-apache-pgsql/ubuntu/.dockerignore rename to Dockerfiles/web-apache-pgsql/ubuntu/.dockerignore diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile similarity index 100% rename from web-apache-pgsql/ubuntu/Dockerfile rename to Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile diff --git a/web-apache-pgsql/ubuntu/README.md b/Dockerfiles/web-apache-pgsql/ubuntu/README.md similarity index 100% rename from web-apache-pgsql/ubuntu/README.md rename to Dockerfiles/web-apache-pgsql/ubuntu/README.md diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/build.sh b/Dockerfiles/web-apache-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini similarity index 100% rename from web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh similarity index 100% rename from web-apache-pgsql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh diff --git a/web-nginx-mysql/alpine/.dockerignore b/Dockerfiles/web-nginx-mysql/alpine/.dockerignore similarity index 100% rename from web-nginx-mysql/alpine/.dockerignore rename to Dockerfiles/web-nginx-mysql/alpine/.dockerignore diff --git a/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile similarity index 100% rename from web-nginx-mysql/alpine/Dockerfile rename to Dockerfiles/web-nginx-mysql/alpine/Dockerfile diff --git a/web-nginx-mysql/alpine/README.md b/Dockerfiles/web-nginx-mysql/alpine/README.md similarity index 100% rename from web-nginx-mysql/alpine/README.md rename to Dockerfiles/web-nginx-mysql/alpine/README.md diff --git a/Dockerfiles/web-nginx-mysql/alpine/build.sh b/Dockerfiles/web-nginx-mysql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf diff --git a/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf diff --git a/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf diff --git a/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-mysql/alpine/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh similarity index 100% rename from web-nginx-mysql/alpine/docker-entrypoint.sh rename to Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh diff --git a/web-nginx-mysql/centos/.dockerignore b/Dockerfiles/web-nginx-mysql/centos/.dockerignore similarity index 100% rename from web-nginx-mysql/centos/.dockerignore rename to Dockerfiles/web-nginx-mysql/centos/.dockerignore diff --git a/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile similarity index 100% rename from web-nginx-mysql/centos/Dockerfile rename to Dockerfiles/web-nginx-mysql/centos/Dockerfile diff --git a/web-nginx-mysql/centos/README.md b/Dockerfiles/web-nginx-mysql/centos/README.md similarity index 100% rename from web-nginx-mysql/centos/README.md rename to Dockerfiles/web-nginx-mysql/centos/README.md diff --git a/Dockerfiles/web-nginx-mysql/centos/build.sh b/Dockerfiles/web-nginx-mysql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-mysql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf diff --git a/web-nginx-mysql/centos/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.conf diff --git a/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-mysql/centos/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh similarity index 100% rename from web-nginx-mysql/centos/docker-entrypoint.sh rename to Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh diff --git a/web-nginx-mysql/ubuntu/.dockerignore b/Dockerfiles/web-nginx-mysql/ubuntu/.dockerignore similarity index 100% rename from web-nginx-mysql/ubuntu/.dockerignore rename to Dockerfiles/web-nginx-mysql/ubuntu/.dockerignore diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile similarity index 100% rename from web-nginx-mysql/ubuntu/Dockerfile rename to Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile diff --git a/web-nginx-mysql/ubuntu/README.md b/Dockerfiles/web-nginx-mysql/ubuntu/README.md similarity index 100% rename from web-nginx-mysql/ubuntu/README.md rename to Dockerfiles/web-nginx-mysql/ubuntu/README.md diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/build.sh b/Dockerfiles/web-nginx-mysql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh similarity index 100% rename from web-nginx-mysql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh diff --git a/web-nginx-pgsql/alpine/.dockerignore b/Dockerfiles/web-nginx-pgsql/alpine/.dockerignore similarity index 100% rename from web-nginx-pgsql/alpine/.dockerignore rename to Dockerfiles/web-nginx-pgsql/alpine/.dockerignore diff --git a/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile similarity index 100% rename from web-nginx-pgsql/alpine/Dockerfile rename to Dockerfiles/web-nginx-pgsql/alpine/Dockerfile diff --git a/web-nginx-pgsql/alpine/README.md b/Dockerfiles/web-nginx-pgsql/alpine/README.md similarity index 100% rename from web-nginx-pgsql/alpine/README.md rename to Dockerfiles/web-nginx-pgsql/alpine/README.md diff --git a/Dockerfiles/web-nginx-pgsql/alpine/build.sh b/Dockerfiles/web-nginx-pgsql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh similarity index 100% rename from web-nginx-pgsql/alpine/docker-entrypoint.sh rename to Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh diff --git a/web-nginx-pgsql/centos/.dockerignore b/Dockerfiles/web-nginx-pgsql/centos/.dockerignore similarity index 100% rename from web-nginx-pgsql/centos/.dockerignore rename to Dockerfiles/web-nginx-pgsql/centos/.dockerignore diff --git a/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile similarity index 100% rename from web-nginx-pgsql/centos/Dockerfile rename to Dockerfiles/web-nginx-pgsql/centos/Dockerfile diff --git a/web-nginx-pgsql/centos/README.md b/Dockerfiles/web-nginx-pgsql/centos/README.md similarity index 100% rename from web-nginx-pgsql/centos/README.md rename to Dockerfiles/web-nginx-pgsql/centos/README.md diff --git a/Dockerfiles/web-nginx-pgsql/centos/build.sh b/Dockerfiles/web-nginx-pgsql/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-pgsql/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf diff --git a/web-nginx-pgsql/centos/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.conf diff --git a/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-pgsql/centos/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh similarity index 100% rename from web-nginx-pgsql/centos/docker-entrypoint.sh rename to Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh diff --git a/web-nginx-pgsql/ubuntu/.dockerignore b/Dockerfiles/web-nginx-pgsql/ubuntu/.dockerignore similarity index 100% rename from web-nginx-pgsql/ubuntu/.dockerignore rename to Dockerfiles/web-nginx-pgsql/ubuntu/.dockerignore diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile similarity index 100% rename from web-nginx-pgsql/ubuntu/Dockerfile rename to Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile diff --git a/web-nginx-pgsql/ubuntu/README.md b/Dockerfiles/web-nginx-pgsql/ubuntu/README.md similarity index 100% rename from web-nginx-pgsql/ubuntu/README.md rename to Dockerfiles/web-nginx-pgsql/ubuntu/README.md diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/build.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh similarity index 100% rename from web-nginx-pgsql/ubuntu/docker-entrypoint.sh rename to Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh diff --git a/zabbix-appliance/rhel/.dockerignore b/Dockerfiles/zabbix-appliance/rhel/.dockerignore similarity index 100% rename from zabbix-appliance/rhel/.dockerignore rename to Dockerfiles/zabbix-appliance/rhel/.dockerignore diff --git a/zabbix-appliance/rhel/Dockerfile b/Dockerfiles/zabbix-appliance/rhel/Dockerfile similarity index 100% rename from zabbix-appliance/rhel/Dockerfile rename to Dockerfiles/zabbix-appliance/rhel/Dockerfile diff --git a/zabbix-appliance/rhel/README.md b/Dockerfiles/zabbix-appliance/rhel/README.md similarity index 100% rename from zabbix-appliance/rhel/README.md rename to Dockerfiles/zabbix-appliance/rhel/README.md diff --git a/Dockerfiles/zabbix-appliance/rhel/build.sh b/Dockerfiles/zabbix-appliance/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/zabbix-appliance/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/zabbix-appliance/rhel/conf/etc/nginx/nginx.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/nginx/nginx.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/nginx/nginx.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/nginx/nginx.conf diff --git a/zabbix-appliance/rhel/conf/etc/php-fpm.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/php-fpm.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/php-fpm.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/php-fpm.conf diff --git a/zabbix-appliance/rhel/conf/etc/php.d/99-zabbix.ini b/Dockerfiles/zabbix-appliance/rhel/conf/etc/php.d/99-zabbix.ini similarity index 100% rename from zabbix-appliance/rhel/conf/etc/php.d/99-zabbix.ini rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/php.d/99-zabbix.ini diff --git a/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_java_gateway.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_java_gateway.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_java_gateway.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_java_gateway.conf diff --git a/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_mysql.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_mysql.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_mysql.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_mysql.conf diff --git a/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_server.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_server.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_server.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_server.conf diff --git a/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf diff --git a/zabbix-appliance/rhel/conf/etc/supervisor/supervisord.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/supervisord.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/supervisor/supervisord.conf diff --git a/zabbix-appliance/rhel/conf/etc/yum.repo.d/nginx.repo b/Dockerfiles/zabbix-appliance/rhel/conf/etc/yum.repo.d/nginx.repo similarity index 100% rename from zabbix-appliance/rhel/conf/etc/yum.repo.d/nginx.repo rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/yum.repo.d/nginx.repo diff --git a/zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf diff --git a/zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf diff --git a/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php diff --git a/zabbix-appliance/rhel/conf/usr/sbin/zabbix_java_gateway b/Dockerfiles/zabbix-appliance/rhel/conf/usr/sbin/zabbix_java_gateway similarity index 100% rename from zabbix-appliance/rhel/conf/usr/sbin/zabbix_java_gateway rename to Dockerfiles/zabbix-appliance/rhel/conf/usr/sbin/zabbix_java_gateway diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh similarity index 100% rename from zabbix-appliance/rhel/docker-entrypoint.sh rename to Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh diff --git a/zabbix-appliance/rhel/licenses/gpl-2.0.txt b/Dockerfiles/zabbix-appliance/rhel/licenses/gpl-2.0.txt similarity index 100% rename from zabbix-appliance/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/zabbix-appliance/rhel/licenses/gpl-2.0.txt diff --git a/agent/alpine/build.sh b/agent/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/agent/centos/build.sh b/agent/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/agent/ubuntu/build.sh b/agent/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 1fde7f5f9..4e170a0c5 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -28,8 +28,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_mysql - - .env_srv + - ./env_vars/.env_db_mysql + - ./env_vars/.env_srv secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -88,8 +88,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -137,9 +137,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql depends_on: - mysql-server - zabbix-java-gateway @@ -183,8 +183,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -233,8 +233,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -289,7 +289,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -321,7 +321,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -372,7 +372,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -414,8 +414,8 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 0179d2d3d..fdf3390e9 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -1,8 +1,8 @@ version: '3.5' services: zabbix-server: - build: - context: ./server-mysql/alpine + build: + context: ./Dockerfiles/server-mysql/alpine cache_from: - alpine:3.11 image: zabbix-server-mysql:alpine-local @@ -65,7 +65,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/alpine + context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - alpine:3.11 image: zabbix-proxy-sqlite3:alpine-local @@ -118,7 +118,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/alpine + context: ./Dockerfiles/proxy-mysql/alpine cache_from: - alpine:3.11 image: zabbix-proxy-mysql:alpine-local @@ -177,7 +177,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/alpine + context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - alpine:3.11 image: zabbix-web-apache-mysql:alpine-local @@ -233,7 +233,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/alpine + context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - alpine:3.11 image: zabbix-web-nginx-mysql:alpine-local @@ -287,7 +287,7 @@ services: zabbix-agent: build: - context: ./agent/alpine + context: ./Dockerfiles/agent/alpine cache_from: - alpine:3.11 image: zabbix-agent:alpine-local @@ -331,7 +331,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/alpine + context: ./Dockerfiles/java-gateway/alpine cache_from: - alpine:3.11 image: zabbix-java-gateway:alpine-local @@ -364,7 +364,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/alpine + context: ./Dockerfiles/snmptraps/alpine cache_from: - alpine:3.11 image: zabbix-snmptraps:alpine-local @@ -446,8 +446,8 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index b29d11b38..7c9f26372 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -28,8 +28,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_pgsql - - .env_srv + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_srv secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -87,8 +87,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -136,9 +136,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -182,8 +182,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -232,8 +232,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -288,7 +288,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -320,7 +320,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -373,7 +373,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -391,7 +391,7 @@ services: volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -439,12 +439,12 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD POSTGRES_USER: - file: ./.POSTGRES_USER + file: ./env_vars/.POSTGRES_USER POSTGRES_PASSWORD: - file: ./.POSTGRES_PASSWORD + file: ./env_vars/.POSTGRES_PASSWORD diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index a202f66d5..3e4f62f1d 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-pgsql/alpine + context: ./Dockerfiles/server-pgsql/alpine cache_from: - alpine:3.11 image: zabbix-server-pgsql:alpine-local @@ -32,8 +32,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_pgsql - - .env_srv + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_srv secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -64,7 +64,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/alpine + context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - alpine:3.11 image: zabbix-proxy-sqlite3:alpine-local @@ -95,8 +95,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -117,7 +117,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/alpine + context: ./Dockerfiles/proxy-mysql/alpine cache_from: - alpine:3.11 image: zabbix-proxy-mysql:alpine-local @@ -148,9 +148,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -177,7 +177,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/alpine + context: ./Dockerfiles/web-apache-pgsql/alpine cache_from: - alpine:3.11 image: zabbix-web-apache-pgsql:alpine-local @@ -199,8 +199,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -233,7 +233,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/alpine + context: ./Dockerfiles/web-nginx-pgsql/alpine cache_from: - alpine:3.11 image: zabbix-web-nginx-pgsql:alpine-local @@ -253,8 +253,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -287,7 +287,7 @@ services: zabbix-agent: build: - context: ./agent/alpine + context: ./Dockerfiles/agent/alpine cache_from: - alpine:3.11 image: zabbix-agent:alpine-local @@ -313,7 +313,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -331,7 +331,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/alpine + context: ./Dockerfiles/java-gateway/alpine cache_from: - alpine:3.11 image: zabbix-java-gateway:alpine-local @@ -349,7 +349,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -364,7 +364,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/alpine + context: ./Dockerfiles/snmptraps/alpine cache_from: - alpine:3.11 image: zabbix-snmptraps:alpine-local @@ -406,7 +406,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -424,7 +424,7 @@ services: volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -472,12 +472,12 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD POSTGRES_USER: - file: ./.POSTGRES_USER + file: ./env_vars/.POSTGRES_USER POSTGRES_PASSWORD: - file: ./.POSTGRES_PASSWORD + file: ./env_vars/.POSTGRES_PASSWORD diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 994e30cce..e5e72b321 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -28,8 +28,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_mysql - - .env_srv + - ./env_vars/.env_db_mysql + - ./env_vars/.env_srv secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -88,8 +88,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -137,9 +137,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql depends_on: - mysql-server - zabbix-java-gateway @@ -183,8 +183,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -233,8 +233,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -289,7 +289,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -321,7 +321,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -372,7 +372,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -414,8 +414,8 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 5eece48f8..301bc4b34 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-mysql/centos + context: ./Dockerfiles/server-mysql/centos cache_from: - centos:centos7 image: zabbix-server-mysql:centos-local @@ -32,8 +32,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_mysql - - .env_srv + - ./env_vars/.env_db_mysql + - ./env_vars/.env_srv secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -65,7 +65,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/centos + context: ./Dockerfiles/proxy-sqlite3/centos cache_from: - centos:centos7 image: zabbix-proxy-sqlite3:centos-local @@ -96,8 +96,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -118,7 +118,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/centos + context: ./Dockerfiles/proxy-mysql/centos cache_from: - centos:centos7 image: zabbix-proxy-mysql:centos-local @@ -149,9 +149,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql depends_on: - mysql-server - zabbix-java-gateway @@ -177,7 +177,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/centos + context: ./Dockerfiles/web-apache-mysql/centos cache_from: - centos:centos7 image: zabbix-web-apache-mysql:centos-local @@ -199,8 +199,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -233,7 +233,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/centos + context: ./Dockerfiles/web-nginx-mysql/centos cache_from: - centos:centos7 image: zabbix-web-nginx-mysql:centos-local @@ -253,8 +253,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -287,7 +287,7 @@ services: zabbix-agent: build: - context: ./agent/centos + context: ./Dockerfiles/agent/centos cache_from: - centos:centos7 image: zabbix-agent:centos-local @@ -313,7 +313,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -331,7 +331,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/centos + context: ./Dockerfiles/java-gateway/centos cache_from: - centos:centos7 image: zabbix-java-gateway:centos-local @@ -349,7 +349,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -364,7 +364,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/centos + context: ./Dockerfiles/snmptraps/centos cache_from: - centos:centos7 image: zabbix-snmptraps:centos-local @@ -404,7 +404,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -446,8 +446,8 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 6de4b18a7..fb04f7d5f 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -28,8 +28,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_pgsql - - .env_srv + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_srv secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -87,8 +87,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -136,9 +136,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -182,8 +182,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -232,8 +232,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -288,7 +288,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -320,7 +320,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -373,7 +373,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -391,7 +391,7 @@ services: volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -439,12 +439,12 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD POSTGRES_USER: - file: ./.POSTGRES_USER + file: ./env_vars/.POSTGRES_USER POSTGRES_PASSWORD: - file: ./.POSTGRES_PASSWORD + file: ./env_vars/.POSTGRES_PASSWORD diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 1d849ae81..9cf04890e 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -1,7 +1,7 @@ version: '3.5' services: zabbix-server: - build: ./server-pgsql/centos + build: ./Dockerfiles/server-pgsql/centos image: zabbix-server-pgsql:centos-local ports: - "10051:10051" @@ -29,8 +29,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_pgsql - - .env_srv + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_srv secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -60,7 +60,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-sqlite3: - build: ./proxy-sqlite3/centos + build: ./Dockerfiles/proxy-sqlite3/centos image: zabbix-proxy-sqlite3:centos-local profiles: - all @@ -89,8 +89,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -110,7 +110,7 @@ services: com.zabbix.os: "centos" zabbix-proxy-mysql: - build: ./proxy-mysql/centos + build: ./Dockerfiles/proxy-mysql/centos image: zabbix-proxy-mysql:centos-local profiles: - all @@ -139,9 +139,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -167,7 +167,7 @@ services: zabbix-web-apache-pgsql: - build: ./web-apache-pgsql/centos + build: ./Dockerfiles/web-apache-pgsql/centos image: zabbix-web-apache-pgsql:centos-local profiles: - all @@ -187,8 +187,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -220,7 +220,7 @@ services: com.zabbix.os: "centos" zabbix-web-nginx-pgsql: - build: ./web-nginx-pgsql/centos + build: ./Dockerfiles/web-nginx-pgsql/centos image: zabbix-web-nginx-pgsql:centos-local ports: - "80:8080" @@ -238,8 +238,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -271,7 +271,7 @@ services: com.zabbix.os: "centos" zabbix-agent: - build: ./agent/centos + build: ./Dockerfiles/agent/centos image: zabbix-agent:centos-local profiles: - full @@ -295,7 +295,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -312,7 +312,7 @@ services: com.zabbix.os: "centos" zabbix-java-gateway: - build: ./java-gateway/centos + build: ./Dockerfiles/java-gateway/centos image: zabbix-java-gateway:centos-local profiles: - full @@ -328,7 +328,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -385,7 +385,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -403,7 +403,7 @@ services: volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -451,12 +451,12 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD POSTGRES_USER: - file: ./.POSTGRES_USER + file: ./env_vars/.POSTGRES_USER POSTGRES_PASSWORD: - file: ./.POSTGRES_PASSWORD + file: ./env_vars/.POSTGRES_PASSWORD diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index 85568a0e4..92e51f28c 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -27,8 +27,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_mysql - - .env_srv + - ./env_vars/.env_db_mysql + - ./env_vars/.env_srv secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -86,8 +86,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -134,9 +134,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql depends_on: - mysql-server secrets: @@ -177,8 +177,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -226,8 +226,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -281,7 +281,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -313,7 +313,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -364,7 +364,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -406,8 +406,8 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 424671e4e..0eb7d9b79 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-mysql/ubuntu + context: ./Dockerfiles/server-mysql/ubuntu cache_from: - ubuntu:bionic image: zabbix-server-mysql:ubuntu-local @@ -31,8 +31,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_mysql - - .env_srv + - ./env_vars/.env_db_mysql + - ./env_vars/.env_srv secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -64,7 +64,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ubuntu + context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - ubuntu:bionic image: zabbix-proxy-sqlite3:ubuntu-local @@ -94,8 +94,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -116,7 +116,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ubuntu + context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - ubuntu:bionic image: zabbix-proxy-mysql:ubuntu-local @@ -146,9 +146,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql depends_on: - mysql-server - zabbix-java-gateway @@ -174,7 +174,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/ubuntu + context: ./Dockerfiles/web-apache-mysql/ubuntu cache_from: - ubuntu:bionic image: zabbix-web-apache-mysql:ubuntu-local @@ -195,8 +195,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -229,7 +229,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/ubuntu + context: ./Dockerfiles/web-nginx-mysql/ubuntu cache_from: - ubuntu:bionic image: zabbix-web-nginx-mysql:ubuntu-local @@ -248,8 +248,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -282,7 +282,7 @@ services: zabbix-agent: build: - context: ./agent/ubuntu + context: ./Dockerfiles/agent/ubuntu cache_from: - ubuntu:bionic image: zabbix-agent:ubuntu-local @@ -307,7 +307,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -325,7 +325,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ubuntu + context: ./Dockerfiles/java-gateway/ubuntu cache_from: - ubuntu:bionic image: zabbix-java-gateway:ubuntu-local @@ -343,7 +343,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -358,7 +358,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ubuntu + context: ./Dockerfiles/snmptraps/ubuntu cache_from: - ubuntu:bionic image: zabbix-snmptraps:ubuntu-local @@ -398,7 +398,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -440,8 +440,8 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 6ff539704..5b4933313 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -27,8 +27,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_pgsql - - .env_srv + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_srv secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -85,8 +85,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -133,9 +133,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -178,8 +178,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -227,8 +227,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -282,7 +282,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -314,7 +314,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -367,7 +367,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -385,7 +385,7 @@ services: volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -433,12 +433,12 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD POSTGRES_USER: - file: ./.POSTGRES_USER + file: ./env_vars/.POSTGRES_USER POSTGRES_PASSWORD: - file: ./.POSTGRES_PASSWORD + file: ./env_vars/.POSTGRES_PASSWORD diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 3b334b9f6..560da4bac 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -1,7 +1,7 @@ version: '3.5' services: zabbix-server: - build: ./server-pgsql/ubuntu + build: ./Dockerfiles/server-pgsql/ubuntu image: zabbix-server-pgsql:ubuntu-local ports: - "10051:10051" @@ -28,8 +28,8 @@ services: cpus: '0.5' memory: 512M env_file: - - .env_db_pgsql - - .env_srv + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_srv secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -59,7 +59,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - build: ./proxy-sqlite3/ubuntu + build: ./Dockerfiles/proxy-sqlite3/ubuntu image: zabbix-proxy-sqlite3:ubuntu-local profiles: - all @@ -87,8 +87,8 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_prx - - .env_prx_sqlite3 + - ./env_vars/.env_prx + - ./env_vars/.env_prx_sqlite3 depends_on: - zabbix-java-gateway - zabbix-snmptraps @@ -108,7 +108,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - build: ./proxy-mysql/ubuntu + build: ./Dockerfiles/proxy-mysql/ubuntu image: zabbix-proxy-mysql:ubuntu-local profiles: - all @@ -136,9 +136,9 @@ services: cpus: '0.3' memory: 256M env_file: - - .env_db_mysql_proxy - - .env_prx - - .env_prx_mysql + - ./env_vars/.env_db_mysql_proxy + - ./env_vars/.env_prx + - ./env_vars/.env_prx_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -164,7 +164,7 @@ services: zabbix-web-apache-pgsql: - build: ./web-apache-pgsql/ubuntu + build: ./Dockerfiles/web-apache-pgsql/ubuntu image: zabbix-web-apache-pgsql:ubuntu-local profiles: - all @@ -183,8 +183,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -216,7 +216,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-pgsql: - build: ./web-nginx-pgsql/ubuntu + build: ./Dockerfiles/web-nginx-pgsql/ubuntu image: zabbix-web-nginx-pgsql:ubuntu-local ports: - "80:8080" @@ -233,8 +233,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -266,7 +266,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - build: ./agent/ubuntu + build: ./Dockerfiles/agent/ubuntu image: zabbix-agent:ubuntu-local profiles: - full @@ -289,7 +289,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -306,7 +306,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - build: ./java-gateway/ubuntu + build: ./Dockerfiles/java-gateway/ubuntu image: zabbix-java-gateway:ubuntu-local profiles: - full @@ -322,7 +322,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -336,7 +336,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - build: ./snmptraps/ubuntu + build: ./Dockerfiles/snmptraps/ubuntu image: zabbix-snmptraps:ubuntu-local profiles: - full @@ -376,7 +376,7 @@ services: volumes: - ./zbx_env/var/lib/mysql:/var/lib/mysql:rw env_file: - - .env_db_mysql + - ./env_vars/.env_db_mysql secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -394,7 +394,7 @@ services: volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -442,12 +442,12 @@ volumes: secrets: MYSQL_USER: - file: ./.MYSQL_USER + file: ./env_vars/.MYSQL_USER MYSQL_PASSWORD: - file: ./.MYSQL_PASSWORD + file: ./env_vars/.MYSQL_PASSWORD MYSQL_ROOT_PASSWORD: - file: ./.MYSQL_ROOT_PASSWORD + file: ./env_vars/.MYSQL_ROOT_PASSWORD POSTGRES_USER: - file: ./.POSTGRES_USER + file: ./env_vars/.POSTGRES_USER POSTGRES_PASSWORD: - file: ./.POSTGRES_PASSWORD + file: ./env_vars/.POSTGRES_PASSWORD diff --git a/.MYSQL_PASSWORD b/env_vars/.MYSQL_PASSWORD similarity index 100% rename from .MYSQL_PASSWORD rename to env_vars/.MYSQL_PASSWORD diff --git a/.MYSQL_ROOT_PASSWORD b/env_vars/.MYSQL_ROOT_PASSWORD similarity index 100% rename from .MYSQL_ROOT_PASSWORD rename to env_vars/.MYSQL_ROOT_PASSWORD diff --git a/.MYSQL_USER b/env_vars/.MYSQL_USER similarity index 100% rename from .MYSQL_USER rename to env_vars/.MYSQL_USER diff --git a/.POSTGRES_PASSWORD b/env_vars/.POSTGRES_PASSWORD similarity index 100% rename from .POSTGRES_PASSWORD rename to env_vars/.POSTGRES_PASSWORD diff --git a/.POSTGRES_USER b/env_vars/.POSTGRES_USER similarity index 100% rename from .POSTGRES_USER rename to env_vars/.POSTGRES_USER diff --git a/.env_agent b/env_vars/.env_agent similarity index 100% rename from .env_agent rename to env_vars/.env_agent diff --git a/.env_db_mysql b/env_vars/.env_db_mysql similarity index 100% rename from .env_db_mysql rename to env_vars/.env_db_mysql diff --git a/.env_db_mysql_proxy b/env_vars/.env_db_mysql_proxy similarity index 100% rename from .env_db_mysql_proxy rename to env_vars/.env_db_mysql_proxy diff --git a/.env_db_pgsql b/env_vars/.env_db_pgsql similarity index 100% rename from .env_db_pgsql rename to env_vars/.env_db_pgsql diff --git a/.env_java b/env_vars/.env_java similarity index 100% rename from .env_java rename to env_vars/.env_java diff --git a/.env_prx b/env_vars/.env_prx similarity index 100% rename from .env_prx rename to env_vars/.env_prx diff --git a/.env_prx_mysql b/env_vars/.env_prx_mysql similarity index 100% rename from .env_prx_mysql rename to env_vars/.env_prx_mysql diff --git a/.env_prx_sqlite3 b/env_vars/.env_prx_sqlite3 similarity index 100% rename from .env_prx_sqlite3 rename to env_vars/.env_prx_sqlite3 diff --git a/.env_srv b/env_vars/.env_srv similarity index 100% rename from .env_srv rename to env_vars/.env_srv diff --git a/.env_web b/env_vars/.env_web similarity index 100% rename from .env_web rename to env_vars/.env_web diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh deleted file mode 100755 index cb3291ba8..000000000 --- a/generate-stackbrew-library.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -set -eu - -declare -a -r versions=( 3.0.28 4.0.11 4.2.5 ) - -self="${BASH_SOURCE##*/}" - -# get the most recent commit which modified any of "$@" -fileCommit() { - git log -1 --format='format:%H' HEAD -- "$@" -} - -# prints "$2$1$3$1...$N" -join() { - local sep="$1"; shift - local out; printf -v out "${sep//%/%%}%s" "$@" - echo "${out#$sep}" -} - -cat <<-EOH -# this file is generated via https://github.com/zabbix/zabbix-docker/blob/$(fileCommit "$self")/$self - -Maintainers: Alexey Pustovalov (@dotneft) -GitRepo: https://github.com/zabbix/zabbix-docker.git -EOH - -for version in "${versions[@]}"; do - major_version=${version%.*} - commit=`git rev-list -n 1 "$version"` - - for component in agent java-gateway proxy-{mysql,sqlite3} server-{mysql,pgsql} web-{apache,nginx}-{mysql,pgsql}; do - for variant in alpine; do - dir="${component}/${variant}" - [ -f "$dir/Dockerfile" ] || continue - - variantArches=( amd64 ) - - echo - cat <<-EOE - Tags: $version-$component, $major_version-$component - Architectures: $(join ', ' "${variantArches[@]}") - GitCommit: $commit - GitFetch: refs/heads/$major_version - Directory: $dir - EOE - done - done -done diff --git a/java-gateway/alpine/build.sh b/java-gateway/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/java-gateway/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/java-gateway/centos/build.sh b/java-gateway/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/java-gateway/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/java-gateway/ubuntu/build.sh b/java-gateway/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/java-gateway/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/kubernetes.yaml b/kubernetes.yaml index 08e18a6f5..bf74b7166 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -210,7 +210,7 @@ spec: readOnly: true volumes: - hostPath: - path: /home/dotneft/zbx/zbx_env/etc/ssl/nginx/ + path: ./zbx_env/etc/ssl/nginx/ name: zabbix-web-ssl --- apiVersion: v1 diff --git a/proxy-mysql/alpine/build.sh b/proxy-mysql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-mysql/centos/build.sh b/proxy-mysql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-mysql/ubuntu/build.sh b/proxy-mysql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/alpine/build.sh b/proxy-sqlite3/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-sqlite3/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/centos/build.sh b/proxy-sqlite3/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-sqlite3/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/ubuntu/build.sh b/proxy-sqlite3/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-sqlite3/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-mysql/alpine/build.sh b/server-mysql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-mysql/centos/build.sh b/server-mysql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-mysql/ubuntu/build.sh b/server-mysql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-pgsql/alpine/build.sh b/server-pgsql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-pgsql/centos/build.sh b/server-pgsql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-pgsql/ubuntu/build.sh b/server-pgsql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/snmptraps/alpine/build.sh b/snmptraps/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/snmptraps/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/snmptraps/centos/build.sh b/snmptraps/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/snmptraps/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/snmptraps/ubuntu/build.sh b/snmptraps/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/snmptraps/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/alpine/build.sh b/web-apache-mysql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/centos/build.sh b/web-apache-mysql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/ubuntu/build.sh b/web-apache-mysql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/alpine/build.sh b/web-apache-pgsql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/centos/build.sh b/web-apache-pgsql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/ubuntu/build.sh b/web-apache-pgsql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/alpine/build.sh b/web-nginx-mysql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/centos/build.sh b/web-nginx-mysql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-mysql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/ubuntu/build.sh b/web-nginx-mysql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/alpine/build.sh b/web-nginx-pgsql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/centos/build.sh b/web-nginx-pgsql/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-pgsql/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/ubuntu/build.sh b/web-nginx-pgsql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/zabbix-appliance/rhel/build.sh b/zabbix-appliance/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/zabbix-appliance/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file