diff --git a/.github/workflows/dockerhub_description.yml b/.github/workflows/dockerhub_description.yml index a64eb4110..d5b61bbe0 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: @@ -36,9 +36,9 @@ jobs: uses: actions/checkout@v2 - name: Update DockerHub repo description - uses: peter-evans/dockerhub-description@v2 + uses: peter-evans/dockerhub-description@v2.4.3 with: 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 96% rename from .github/workflows/CI.yml rename to .github/workflows/images_build.yml index 934510c27..558971615 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/images_build.yml @@ -1,4 +1,4 @@ -name: CI +name: Images build on: release: @@ -8,13 +8,12 @@ on: branches: - '4.0' - '5.0' - - '5.2' - '5.4' - 'trunk' paths-ignore: - - '.env*' + - 'env_vars/*' - 'docker-compose*.yaml' - - '*/rhel/*' + - 'Dockerfiles/*/rhel/*' - "**.md" defaults: @@ -174,8 +173,8 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: - context: ./${{ matrix.build }}/${{ matrix.os }} - file: ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile + context: ./Dockerfiles/${{ matrix.build }}/${{ matrix.os }} + file: ./Dockerfiles/${{ matrix.build }}/${{ matrix.os }}/Dockerfile platforms: ${{ steps.platform.outputs.list }} push: ${{ secrets.AUTO_PUSH_IMAGES }} tags: ${{ steps.prepare_tags.outputs.image_tag_versions }} 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/ol/.dockerignore b/Dockerfiles/agent/ol/.dockerignore similarity index 100% rename from agent/ol/.dockerignore rename to Dockerfiles/agent/ol/.dockerignore diff --git a/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile similarity index 100% rename from agent/ol/Dockerfile rename to Dockerfiles/agent/ol/Dockerfile diff --git a/agent/ol/README.md b/Dockerfiles/agent/ol/README.md similarity index 100% rename from agent/ol/README.md rename to Dockerfiles/agent/ol/README.md diff --git a/Dockerfiles/agent/ol/build.sh b/Dockerfiles/agent/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/agent/ol/docker-entrypoint.sh b/Dockerfiles/agent/ol/docker-entrypoint.sh similarity index 100% rename from agent/ol/docker-entrypoint.sh rename to Dockerfiles/agent/ol/docker-entrypoint.sh diff --git a/agent/ol/hooks/build b/Dockerfiles/agent/ol/hooks/build similarity index 100% rename from agent/ol/hooks/build rename to Dockerfiles/agent/ol/hooks/build diff --git a/agent/rhel/.dockerignore b/Dockerfiles/agent/rhel/.dockerignore similarity index 100% rename from agent/rhel/.dockerignore rename to Dockerfiles/agent/rhel/.dockerignore diff --git a/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile similarity index 100% rename from agent/rhel/Dockerfile rename to Dockerfiles/agent/rhel/Dockerfile diff --git a/agent/rhel/README.md b/Dockerfiles/agent/rhel/README.md similarity index 100% rename from agent/rhel/README.md rename to Dockerfiles/agent/rhel/README.md diff --git a/Dockerfiles/agent/rhel/build.sh b/Dockerfiles/agent/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent/rhel/docker-entrypoint.sh b/Dockerfiles/agent/rhel/docker-entrypoint.sh similarity index 100% rename from agent/rhel/docker-entrypoint.sh rename to Dockerfiles/agent/rhel/docker-entrypoint.sh diff --git a/agent/rhel/hooks/build b/Dockerfiles/agent/rhel/hooks/build similarity index 100% rename from agent/rhel/hooks/build rename to Dockerfiles/agent/rhel/hooks/build diff --git a/agent/rhel/licenses/gpl-2.0.txt b/Dockerfiles/agent/rhel/licenses/gpl-2.0.txt similarity index 100% rename from agent/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/agent/rhel/licenses/gpl-2.0.txt 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/agent2/alpine/.dockerignore b/Dockerfiles/agent2/alpine/.dockerignore similarity index 100% rename from agent2/alpine/.dockerignore rename to Dockerfiles/agent2/alpine/.dockerignore diff --git a/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile similarity index 100% rename from agent2/alpine/Dockerfile rename to Dockerfiles/agent2/alpine/Dockerfile diff --git a/agent2/alpine/README.md b/Dockerfiles/agent2/alpine/README.md similarity index 100% rename from agent2/alpine/README.md rename to Dockerfiles/agent2/alpine/README.md diff --git a/Dockerfiles/agent2/alpine/build.sh b/Dockerfiles/agent2/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent2/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent2/alpine/docker-entrypoint.sh b/Dockerfiles/agent2/alpine/docker-entrypoint.sh similarity index 100% rename from agent2/alpine/docker-entrypoint.sh rename to Dockerfiles/agent2/alpine/docker-entrypoint.sh diff --git a/agent2/alpine/hooks/build b/Dockerfiles/agent2/alpine/hooks/build similarity index 100% rename from agent2/alpine/hooks/build rename to Dockerfiles/agent2/alpine/hooks/build diff --git a/agent2/ol/.dockerignore b/Dockerfiles/agent2/ol/.dockerignore similarity index 100% rename from agent2/ol/.dockerignore rename to Dockerfiles/agent2/ol/.dockerignore diff --git a/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile similarity index 100% rename from agent2/ol/Dockerfile rename to Dockerfiles/agent2/ol/Dockerfile diff --git a/agent2/ol/README.md b/Dockerfiles/agent2/ol/README.md similarity index 100% rename from agent2/ol/README.md rename to Dockerfiles/agent2/ol/README.md diff --git a/Dockerfiles/agent2/ol/build.sh b/Dockerfiles/agent2/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent2/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/agent2/ol/docker-entrypoint.sh b/Dockerfiles/agent2/ol/docker-entrypoint.sh similarity index 100% rename from agent2/ol/docker-entrypoint.sh rename to Dockerfiles/agent2/ol/docker-entrypoint.sh diff --git a/agent2/ol/hooks/build b/Dockerfiles/agent2/ol/hooks/build similarity index 100% rename from agent2/ol/hooks/build rename to Dockerfiles/agent2/ol/hooks/build diff --git a/agent2/rhel/.dockerignore b/Dockerfiles/agent2/rhel/.dockerignore similarity index 100% rename from agent2/rhel/.dockerignore rename to Dockerfiles/agent2/rhel/.dockerignore diff --git a/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile similarity index 100% rename from agent2/rhel/Dockerfile rename to Dockerfiles/agent2/rhel/Dockerfile diff --git a/agent2/rhel/README.md b/Dockerfiles/agent2/rhel/README.md similarity index 100% rename from agent2/rhel/README.md rename to Dockerfiles/agent2/rhel/README.md diff --git a/Dockerfiles/agent2/rhel/build.sh b/Dockerfiles/agent2/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent2/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent2/rhel/docker-entrypoint.sh b/Dockerfiles/agent2/rhel/docker-entrypoint.sh similarity index 100% rename from agent2/rhel/docker-entrypoint.sh rename to Dockerfiles/agent2/rhel/docker-entrypoint.sh diff --git a/agent2/rhel/hooks/build b/Dockerfiles/agent2/rhel/hooks/build similarity index 100% rename from agent2/rhel/hooks/build rename to Dockerfiles/agent2/rhel/hooks/build diff --git a/agent2/rhel/licenses/gpl-2.0.txt b/Dockerfiles/agent2/rhel/licenses/gpl-2.0.txt similarity index 100% rename from agent2/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/agent2/rhel/licenses/gpl-2.0.txt diff --git a/agent2/ubuntu/.dockerignore b/Dockerfiles/agent2/ubuntu/.dockerignore similarity index 100% rename from agent2/ubuntu/.dockerignore rename to Dockerfiles/agent2/ubuntu/.dockerignore diff --git a/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile similarity index 100% rename from agent2/ubuntu/Dockerfile rename to Dockerfiles/agent2/ubuntu/Dockerfile diff --git a/agent2/ubuntu/README.md b/Dockerfiles/agent2/ubuntu/README.md similarity index 100% rename from agent2/ubuntu/README.md rename to Dockerfiles/agent2/ubuntu/README.md diff --git a/Dockerfiles/agent2/ubuntu/build.sh b/Dockerfiles/agent2/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/agent2/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/agent2/ubuntu/docker-entrypoint.sh b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh similarity index 100% rename from agent2/ubuntu/docker-entrypoint.sh rename to Dockerfiles/agent2/ubuntu/docker-entrypoint.sh diff --git a/agent2/ubuntu/hooks/build b/Dockerfiles/agent2/ubuntu/hooks/build similarity index 100% rename from agent2/ubuntu/hooks/build rename to Dockerfiles/agent2/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/ol/.dockerignore b/Dockerfiles/java-gateway/ol/.dockerignore similarity index 100% rename from java-gateway/ol/.dockerignore rename to Dockerfiles/java-gateway/ol/.dockerignore diff --git a/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile similarity index 99% rename from java-gateway/ol/Dockerfile rename to Dockerfiles/java-gateway/ol/Dockerfile index 59bb1deb8..19b7a776c 100644 --- a/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -40,8 +40,6 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati org.opencontainers.image.version="${ZBX_VERSION}" \ org.opencontainers.image.source="${ZBX_SOURCES}" -COPY ["conf/etc/", "/etc/"] - RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \ INSTALL_PKGS="autoconf \ automake \ diff --git a/java-gateway/ol/README.md b/Dockerfiles/java-gateway/ol/README.md similarity index 100% rename from java-gateway/ol/README.md rename to Dockerfiles/java-gateway/ol/README.md diff --git a/Dockerfiles/java-gateway/ol/build.sh b/Dockerfiles/java-gateway/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/java-gateway/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/java-gateway/ol/conf/usr/sbin/zabbix_java_gateway b/Dockerfiles/java-gateway/ol/conf/usr/sbin/zabbix_java_gateway similarity index 100% rename from java-gateway/ol/conf/usr/sbin/zabbix_java_gateway rename to Dockerfiles/java-gateway/ol/conf/usr/sbin/zabbix_java_gateway diff --git a/java-gateway/ol/docker-entrypoint.sh b/Dockerfiles/java-gateway/ol/docker-entrypoint.sh similarity index 100% rename from java-gateway/ol/docker-entrypoint.sh rename to Dockerfiles/java-gateway/ol/docker-entrypoint.sh diff --git a/java-gateway/rhel/.dockerignore b/Dockerfiles/java-gateway/rhel/.dockerignore similarity index 100% rename from java-gateway/rhel/.dockerignore rename to Dockerfiles/java-gateway/rhel/.dockerignore diff --git a/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile similarity index 100% rename from java-gateway/rhel/Dockerfile rename to Dockerfiles/java-gateway/rhel/Dockerfile diff --git a/java-gateway/rhel/README.md b/Dockerfiles/java-gateway/rhel/README.md similarity index 100% rename from java-gateway/rhel/README.md rename to Dockerfiles/java-gateway/rhel/README.md diff --git a/Dockerfiles/java-gateway/rhel/build.sh b/Dockerfiles/java-gateway/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/java-gateway/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/java-gateway/rhel/conf/usr/sbin/zabbix_java_gateway b/Dockerfiles/java-gateway/rhel/conf/usr/sbin/zabbix_java_gateway similarity index 100% rename from java-gateway/rhel/conf/usr/sbin/zabbix_java_gateway rename to Dockerfiles/java-gateway/rhel/conf/usr/sbin/zabbix_java_gateway diff --git a/java-gateway/rhel/docker-entrypoint.sh b/Dockerfiles/java-gateway/rhel/docker-entrypoint.sh similarity index 100% rename from java-gateway/rhel/docker-entrypoint.sh rename to Dockerfiles/java-gateway/rhel/docker-entrypoint.sh diff --git a/java-gateway/rhel/licenses/gpl-2.0.txt b/Dockerfiles/java-gateway/rhel/licenses/gpl-2.0.txt similarity index 100% rename from java-gateway/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/java-gateway/rhel/licenses/gpl-2.0.txt 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/ol/.dockerignore b/Dockerfiles/proxy-mysql/ol/.dockerignore similarity index 100% rename from proxy-mysql/ol/.dockerignore rename to Dockerfiles/proxy-mysql/ol/.dockerignore diff --git a/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile similarity index 100% rename from proxy-mysql/ol/Dockerfile rename to Dockerfiles/proxy-mysql/ol/Dockerfile diff --git a/proxy-mysql/ol/README.md b/Dockerfiles/proxy-mysql/ol/README.md similarity index 100% rename from proxy-mysql/ol/README.md rename to Dockerfiles/proxy-mysql/ol/README.md diff --git a/Dockerfiles/proxy-mysql/ol/build.sh b/Dockerfiles/proxy-mysql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-mysql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh similarity index 100% rename from proxy-mysql/ol/docker-entrypoint.sh rename to Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh diff --git a/proxy-mysql/rhel/.dockerignore b/Dockerfiles/proxy-mysql/rhel/.dockerignore similarity index 100% rename from proxy-mysql/rhel/.dockerignore rename to Dockerfiles/proxy-mysql/rhel/.dockerignore diff --git a/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile similarity index 100% rename from proxy-mysql/rhel/Dockerfile rename to Dockerfiles/proxy-mysql/rhel/Dockerfile diff --git a/proxy-mysql/rhel/README.md b/Dockerfiles/proxy-mysql/rhel/README.md similarity index 100% rename from proxy-mysql/rhel/README.md rename to Dockerfiles/proxy-mysql/rhel/README.md diff --git a/Dockerfiles/proxy-mysql/rhel/build.sh b/Dockerfiles/proxy-mysql/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-mysql/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh similarity index 100% rename from proxy-mysql/rhel/docker-entrypoint.sh rename to Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh diff --git a/proxy-mysql/rhel/licenses/gpl-2.0.txt b/Dockerfiles/proxy-mysql/rhel/licenses/gpl-2.0.txt similarity index 100% rename from proxy-mysql/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/proxy-mysql/rhel/licenses/gpl-2.0.txt 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/ol/.dockerignore b/Dockerfiles/proxy-sqlite3/ol/.dockerignore similarity index 100% rename from proxy-sqlite3/ol/.dockerignore rename to Dockerfiles/proxy-sqlite3/ol/.dockerignore diff --git a/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile similarity index 100% rename from proxy-sqlite3/ol/Dockerfile rename to Dockerfiles/proxy-sqlite3/ol/Dockerfile diff --git a/proxy-sqlite3/ol/README.md b/Dockerfiles/proxy-sqlite3/ol/README.md similarity index 100% rename from proxy-sqlite3/ol/README.md rename to Dockerfiles/proxy-sqlite3/ol/README.md diff --git a/Dockerfiles/proxy-sqlite3/ol/build.sh b/Dockerfiles/proxy-sqlite3/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-sqlite3/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh similarity index 100% rename from proxy-sqlite3/ol/docker-entrypoint.sh rename to Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh diff --git a/proxy-sqlite3/rhel/.dockerignore b/Dockerfiles/proxy-sqlite3/rhel/.dockerignore similarity index 100% rename from proxy-sqlite3/rhel/.dockerignore rename to Dockerfiles/proxy-sqlite3/rhel/.dockerignore diff --git a/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile similarity index 100% rename from proxy-sqlite3/rhel/Dockerfile rename to Dockerfiles/proxy-sqlite3/rhel/Dockerfile diff --git a/proxy-sqlite3/rhel/README.md b/Dockerfiles/proxy-sqlite3/rhel/README.md similarity index 100% rename from proxy-sqlite3/rhel/README.md rename to Dockerfiles/proxy-sqlite3/rhel/README.md diff --git a/Dockerfiles/proxy-sqlite3/rhel/build.sh b/Dockerfiles/proxy-sqlite3/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/proxy-sqlite3/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh similarity index 100% rename from proxy-sqlite3/rhel/docker-entrypoint.sh rename to Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh diff --git a/proxy-sqlite3/rhel/licenses/gpl-2.0.txt b/Dockerfiles/proxy-sqlite3/rhel/licenses/gpl-2.0.txt similarity index 100% rename from proxy-sqlite3/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/proxy-sqlite3/rhel/licenses/gpl-2.0.txt 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/ol/.dockerignore b/Dockerfiles/server-mysql/ol/.dockerignore similarity index 100% rename from server-mysql/ol/.dockerignore rename to Dockerfiles/server-mysql/ol/.dockerignore diff --git a/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile similarity index 100% rename from server-mysql/ol/Dockerfile rename to Dockerfiles/server-mysql/ol/Dockerfile diff --git a/server-mysql/ol/README.md b/Dockerfiles/server-mysql/ol/README.md similarity index 100% rename from server-mysql/ol/README.md rename to Dockerfiles/server-mysql/ol/README.md diff --git a/Dockerfiles/server-mysql/ol/build.sh b/Dockerfiles/server-mysql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-mysql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh similarity index 100% rename from server-mysql/ol/docker-entrypoint.sh rename to Dockerfiles/server-mysql/ol/docker-entrypoint.sh diff --git a/server-mysql/rhel/.dockerignore b/Dockerfiles/server-mysql/rhel/.dockerignore similarity index 100% rename from server-mysql/rhel/.dockerignore rename to Dockerfiles/server-mysql/rhel/.dockerignore diff --git a/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile similarity index 100% rename from server-mysql/rhel/Dockerfile rename to Dockerfiles/server-mysql/rhel/Dockerfile diff --git a/server-mysql/rhel/README.md b/Dockerfiles/server-mysql/rhel/README.md similarity index 100% rename from server-mysql/rhel/README.md rename to Dockerfiles/server-mysql/rhel/README.md diff --git a/Dockerfiles/server-mysql/rhel/build.sh b/Dockerfiles/server-mysql/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-mysql/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh similarity index 100% rename from server-mysql/rhel/docker-entrypoint.sh rename to Dockerfiles/server-mysql/rhel/docker-entrypoint.sh diff --git a/server-mysql/rhel/licenses/gpl-2.0.txt b/Dockerfiles/server-mysql/rhel/licenses/gpl-2.0.txt similarity index 100% rename from server-mysql/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/server-mysql/rhel/licenses/gpl-2.0.txt 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/ol/.dockerignore b/Dockerfiles/server-pgsql/ol/.dockerignore similarity index 100% rename from server-pgsql/ol/.dockerignore rename to Dockerfiles/server-pgsql/ol/.dockerignore diff --git a/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile similarity index 100% rename from server-pgsql/ol/Dockerfile rename to Dockerfiles/server-pgsql/ol/Dockerfile diff --git a/server-pgsql/ol/README.md b/Dockerfiles/server-pgsql/ol/README.md similarity index 100% rename from server-pgsql/ol/README.md rename to Dockerfiles/server-pgsql/ol/README.md diff --git a/Dockerfiles/server-pgsql/ol/build.sh b/Dockerfiles/server-pgsql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/server-pgsql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh similarity index 100% rename from server-pgsql/ol/docker-entrypoint.sh rename to Dockerfiles/server-pgsql/ol/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/ol/.dockerignore b/Dockerfiles/snmptraps/ol/.dockerignore similarity index 100% rename from snmptraps/ol/.dockerignore rename to Dockerfiles/snmptraps/ol/.dockerignore diff --git a/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile similarity index 100% rename from snmptraps/ol/Dockerfile rename to Dockerfiles/snmptraps/ol/Dockerfile diff --git a/snmptraps/ol/README.md b/Dockerfiles/snmptraps/ol/README.md similarity index 100% rename from snmptraps/ol/README.md rename to Dockerfiles/snmptraps/ol/README.md diff --git a/Dockerfiles/snmptraps/ol/build.sh b/Dockerfiles/snmptraps/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/snmptraps/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps similarity index 100% rename from snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps rename to Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps diff --git a/snmptraps/ol/conf/etc/snmp/snmptrapd.conf b/Dockerfiles/snmptraps/ol/conf/etc/snmp/snmptrapd.conf similarity index 100% rename from snmptraps/ol/conf/etc/snmp/snmptrapd.conf rename to Dockerfiles/snmptraps/ol/conf/etc/snmp/snmptrapd.conf diff --git a/snmptraps/ol/conf/usr/sbin/zabbix_trap_handler.sh b/Dockerfiles/snmptraps/ol/conf/usr/sbin/zabbix_trap_handler.sh similarity index 100% rename from snmptraps/ol/conf/usr/sbin/zabbix_trap_handler.sh rename to Dockerfiles/snmptraps/ol/conf/usr/sbin/zabbix_trap_handler.sh diff --git a/snmptraps/rhel/.dockerignore b/Dockerfiles/snmptraps/rhel/.dockerignore similarity index 100% rename from snmptraps/rhel/.dockerignore rename to Dockerfiles/snmptraps/rhel/.dockerignore diff --git a/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile similarity index 100% rename from snmptraps/rhel/Dockerfile rename to Dockerfiles/snmptraps/rhel/Dockerfile diff --git a/snmptraps/rhel/README.md b/Dockerfiles/snmptraps/rhel/README.md similarity index 100% rename from snmptraps/rhel/README.md rename to Dockerfiles/snmptraps/rhel/README.md diff --git a/Dockerfiles/snmptraps/rhel/build.sh b/Dockerfiles/snmptraps/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/snmptraps/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps similarity index 100% rename from snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps rename to Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps diff --git a/snmptraps/rhel/conf/etc/snmp/snmptrapd.conf b/Dockerfiles/snmptraps/rhel/conf/etc/snmp/snmptrapd.conf similarity index 100% rename from snmptraps/rhel/conf/etc/snmp/snmptrapd.conf rename to Dockerfiles/snmptraps/rhel/conf/etc/snmp/snmptrapd.conf diff --git a/snmptraps/rhel/conf/usr/sbin/zabbix_trap_handler.sh b/Dockerfiles/snmptraps/rhel/conf/usr/sbin/zabbix_trap_handler.sh similarity index 100% rename from snmptraps/rhel/conf/usr/sbin/zabbix_trap_handler.sh rename to Dockerfiles/snmptraps/rhel/conf/usr/sbin/zabbix_trap_handler.sh diff --git a/snmptraps/rhel/licenses/gpl-2.0.txt b/Dockerfiles/snmptraps/rhel/licenses/gpl-2.0.txt similarity index 100% rename from snmptraps/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/snmptraps/rhel/licenses/gpl-2.0.txt 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-fpm.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/php-fpm.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.conf diff --git a/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-apache-mysql/centos/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-apache-mysql/centos/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-apache-mysql/centos/conf/etc/supervisor/supervisord.conf 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/ol/.dockerignore b/Dockerfiles/web-apache-mysql/ol/.dockerignore similarity index 100% rename from web-apache-mysql/ol/.dockerignore rename to Dockerfiles/web-apache-mysql/ol/.dockerignore diff --git a/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile similarity index 100% rename from web-apache-mysql/ol/Dockerfile rename to Dockerfiles/web-apache-mysql/ol/Dockerfile diff --git a/web-apache-mysql/ol/README.md b/Dockerfiles/web-apache-mysql/ol/README.md similarity index 100% rename from web-apache-mysql/ol/README.md rename to Dockerfiles/web-apache-mysql/ol/README.md diff --git a/Dockerfiles/web-apache-mysql/ol/build.sh b/Dockerfiles/web-apache-mysql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-mysql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf.d/99-zabbix.conf diff --git a/web-apache-mysql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/php-fpm.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.conf diff --git a/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-apache-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-apache-mysql/ol/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/supervisor/supervisord.conf diff --git a/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/web-apache-mysql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf diff --git a/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh similarity index 100% rename from web-apache-mysql/ol/docker-entrypoint.sh rename to Dockerfiles/web-apache-mysql/ol/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.4/apache2/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini similarity index 100% rename from web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/7.4/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-fpm.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/php-fpm.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.conf diff --git a/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-apache-pgsql/centos/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-apache-pgsql/centos/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-apache-pgsql/centos/conf/etc/supervisor/supervisord.conf 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/ol/.dockerignore b/Dockerfiles/web-apache-pgsql/ol/.dockerignore similarity index 100% rename from web-apache-pgsql/ol/.dockerignore rename to Dockerfiles/web-apache-pgsql/ol/.dockerignore diff --git a/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile similarity index 100% rename from web-apache-pgsql/ol/Dockerfile rename to Dockerfiles/web-apache-pgsql/ol/Dockerfile diff --git a/web-apache-pgsql/ol/README.md b/Dockerfiles/web-apache-pgsql/ol/README.md similarity index 100% rename from web-apache-pgsql/ol/README.md rename to Dockerfiles/web-apache-pgsql/ol/README.md diff --git a/Dockerfiles/web-apache-pgsql/ol/build.sh b/Dockerfiles/web-apache-pgsql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-apache-pgsql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf.d/99-zabbix.conf diff --git a/web-apache-pgsql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/php-fpm.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.conf diff --git a/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-apache-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-apache-pgsql/ol/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/supervisor/supervisord.conf diff --git a/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/zabbix/apache.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf diff --git a/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf similarity index 100% rename from web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf diff --git a/web-apache-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-apache-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh similarity index 100% rename from web-apache-pgsql/ol/docker-entrypoint.sh rename to Dockerfiles/web-apache-pgsql/ol/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.4/apache2/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini similarity index 100% rename from web-apache-pgsql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/7.4/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/ol/.dockerignore b/Dockerfiles/web-nginx-mysql/ol/.dockerignore similarity index 100% rename from web-nginx-mysql/ol/.dockerignore rename to Dockerfiles/web-nginx-mysql/ol/.dockerignore diff --git a/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile similarity index 100% rename from web-nginx-mysql/ol/Dockerfile rename to Dockerfiles/web-nginx-mysql/ol/Dockerfile diff --git a/web-nginx-mysql/ol/README.md b/Dockerfiles/web-nginx-mysql/ol/README.md similarity index 100% rename from web-nginx-mysql/ol/README.md rename to Dockerfiles/web-nginx-mysql/ol/README.md diff --git a/Dockerfiles/web-nginx-mysql/ol/build.sh b/Dockerfiles/web-nginx-mysql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-mysql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf diff --git a/web-nginx-mysql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.conf diff --git a/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-mysql/ol/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh similarity index 100% rename from web-nginx-mysql/ol/docker-entrypoint.sh rename to Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh diff --git a/web-nginx-mysql/rhel/.dockerignore b/Dockerfiles/web-nginx-mysql/rhel/.dockerignore similarity index 100% rename from web-nginx-mysql/rhel/.dockerignore rename to Dockerfiles/web-nginx-mysql/rhel/.dockerignore diff --git a/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile similarity index 100% rename from web-nginx-mysql/rhel/Dockerfile rename to Dockerfiles/web-nginx-mysql/rhel/Dockerfile diff --git a/web-nginx-mysql/rhel/README.md b/Dockerfiles/web-nginx-mysql/rhel/README.md similarity index 100% rename from web-nginx-mysql/rhel/README.md rename to Dockerfiles/web-nginx-mysql/rhel/README.md diff --git a/Dockerfiles/web-nginx-mysql/rhel/build.sh b/Dockerfiles/web-nginx-mysql/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-mysql/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf diff --git a/web-nginx-mysql/rhel/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.conf diff --git a/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf diff --git a/web-nginx-mysql/rhel/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/yum.repo.d/nginx.repo diff --git a/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh similarity index 100% rename from web-nginx-mysql/rhel/docker-entrypoint.sh rename to Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh diff --git a/web-nginx-mysql/rhel/licenses/gpl-2.0.txt b/Dockerfiles/web-nginx-mysql/rhel/licenses/gpl-2.0.txt similarity index 100% rename from web-nginx-mysql/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/web-nginx-mysql/rhel/licenses/gpl-2.0.txt 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.4/fpm/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf diff --git a/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf similarity index 100% rename from web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/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/ol/.dockerignore b/Dockerfiles/web-nginx-pgsql/ol/.dockerignore similarity index 100% rename from web-nginx-pgsql/ol/.dockerignore rename to Dockerfiles/web-nginx-pgsql/ol/.dockerignore diff --git a/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile similarity index 100% rename from web-nginx-pgsql/ol/Dockerfile rename to Dockerfiles/web-nginx-pgsql/ol/Dockerfile diff --git a/web-nginx-pgsql/ol/README.md b/Dockerfiles/web-nginx-pgsql/ol/README.md similarity index 100% rename from web-nginx-pgsql/ol/README.md rename to Dockerfiles/web-nginx-pgsql/ol/README.md diff --git a/Dockerfiles/web-nginx-pgsql/ol/build.sh b/Dockerfiles/web-nginx-pgsql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-nginx-pgsql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf diff --git a/web-nginx-pgsql/ol/conf/etc/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.conf diff --git a/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf diff --git a/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf diff --git a/web-nginx-pgsql/ol/conf/etc/supervisor/supervisord.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/supervisord.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/supervisor/supervisord.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/supervisord.conf diff --git a/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf diff --git a/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf diff --git a/web-nginx-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/maintenance.inc.php diff --git a/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php similarity index 100% rename from web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php rename to Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php diff --git a/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh similarity index 100% rename from web-nginx-pgsql/ol/docker-entrypoint.sh rename to Dockerfiles/web-nginx-pgsql/ol/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.4/fpm/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf similarity index 100% rename from web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/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-fpm.d/zabbix.conf b/Dockerfiles/zabbix-appliance/rhel/conf/etc/php-fpm.d/zabbix.conf similarity index 100% rename from zabbix-appliance/rhel/conf/etc/php-fpm.d/zabbix.conf rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/php-fpm.d/zabbix.conf 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/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/maintenance.inc.php b/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/maintenance.inc.php similarity index 100% rename from zabbix-appliance/rhel/conf/etc/zabbix/web/maintenance.inc.php rename to Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/maintenance.inc.php 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/ol/build.sh b/agent/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/agent/rhel/build.sh b/agent/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent/rhel/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/agent2/alpine/build.sh b/agent2/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent2/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/agent2/ol/build.sh b/agent2/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent2/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/agent2/rhel/build.sh b/agent2/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent2/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/agent2/ubuntu/build.sh b/agent2/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/agent2/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 f19939e8c..4584a044f 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -29,8 +29,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 @@ -92,8 +92,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 @@ -141,9 +141,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 @@ -191,8 +191,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 @@ -245,8 +245,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 @@ -304,7 +304,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -336,7 +336,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -392,7 +392,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 @@ -450,18 +450,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index e499a35ca..9fc0b284f 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.12 image: zabbix-server-mysql:alpine-local @@ -33,8 +33,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 @@ -69,7 +69,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/alpine + context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - alpine:3.12 image: zabbix-proxy-sqlite3:alpine-local @@ -100,8 +100,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 @@ -122,7 +122,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/alpine + context: ./Dockerfiles/proxy-mysql/alpine cache_from: - alpine:3.12 image: zabbix-proxy-mysql:alpine-local @@ -153,9 +153,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 @@ -184,7 +184,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/alpine + context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - alpine:3.12 image: zabbix-web-apache-mysql:alpine-local @@ -207,8 +207,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 @@ -244,7 +244,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/alpine + context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - alpine:3.12 image: zabbix-web-nginx-mysql:alpine-local @@ -265,8 +265,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 @@ -302,7 +302,7 @@ services: zabbix-agent: build: - context: ./agent/alpine + context: ./Dockerfiles/agent/alpine cache_from: - alpine:3.12 image: zabbix-agent:alpine-local @@ -328,7 +328,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -346,7 +346,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/alpine + context: ./Dockerfiles/java-gateway/alpine cache_from: - alpine:3.12 image: zabbix-java-gateway:alpine-local @@ -364,7 +364,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -379,7 +379,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/alpine + context: ./Dockerfiles/snmptraps/alpine cache_from: - alpine:3.12 image: zabbix-snmptraps:alpine-local @@ -424,7 +424,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 @@ -482,18 +482,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index 75863dca0..d888484da 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -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 @@ -91,8 +91,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 @@ -140,9 +140,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 @@ -190,8 +190,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 @@ -244,8 +244,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 @@ -300,7 +300,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -332,7 +332,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -386,7 +386,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 @@ -408,7 +408,7 @@ services: - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -469,12 +469,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 57ad75ae7..453013c00 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.12 image: zabbix-server-pgsql:alpine-local @@ -19,9 +19,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -36,8 +36,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 @@ -68,7 +68,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/alpine + context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - alpine:3.12 image: zabbix-proxy-sqlite3:alpine-local @@ -99,8 +99,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 @@ -121,7 +121,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/alpine + context: ./Dockerfiles/proxy-mysql/alpine cache_from: - alpine:3.12 image: zabbix-proxy-mysql:alpine-local @@ -152,9 +152,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 @@ -180,7 +180,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/alpine + context: ./Dockerfiles/web-apache-pgsql/alpine cache_from: - alpine:3.12 image: zabbix-web-apache-pgsql:alpine-local @@ -194,9 +194,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -206,8 +206,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 @@ -240,7 +240,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/alpine + context: ./Dockerfiles/web-nginx-pgsql/alpine cache_from: - alpine:3.12 image: zabbix-web-nginx-pgsql:alpine-local @@ -252,9 +252,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -264,8 +264,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 @@ -298,7 +298,7 @@ services: zabbix-agent: build: - context: ./agent/alpine + context: ./Dockerfiles/agent/alpine cache_from: - alpine:3.12 image: zabbix-agent:alpine-local @@ -324,7 +324,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -342,7 +342,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/alpine + context: ./Dockerfiles/java-gateway/alpine cache_from: - alpine:3.12 image: zabbix-java-gateway:alpine-local @@ -360,7 +360,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -375,7 +375,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/alpine + context: ./Dockerfiles/snmptraps/alpine cache_from: - alpine:3.12 image: zabbix-snmptraps:alpine-local @@ -418,7 +418,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 @@ -436,11 +436,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -501,12 +501,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 67d1ed9fc..8ab716b3e 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -29,8 +29,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 @@ -92,8 +92,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 @@ -141,9 +141,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 @@ -191,8 +191,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 @@ -245,8 +245,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 @@ -304,7 +304,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -336,7 +336,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -392,7 +392,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 @@ -450,18 +450,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index d4a44cb7b..f772df318 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:centos8 image: zabbix-server-mysql:centos-local @@ -33,8 +33,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 @@ -69,7 +69,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/centos + context: ./Dockerfiles/proxy-sqlite3/centos cache_from: - centos:centos8 image: zabbix-proxy-sqlite3:centos-local @@ -100,8 +100,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 @@ -122,7 +122,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/centos + context: ./Dockerfiles/proxy-mysql/centos cache_from: - centos:centos8 image: zabbix-proxy-mysql:centos-local @@ -153,9 +153,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 @@ -184,7 +184,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/centos + context: ./Dockerfiles/web-apache-mysql/centos cache_from: - centos:centos8 image: zabbix-web-apache-mysql:centos-local @@ -207,8 +207,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 @@ -244,7 +244,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/centos + context: ./Dockerfiles/web-nginx-mysql/centos cache_from: - centos:centos8 image: zabbix-web-nginx-mysql:centos-local @@ -265,8 +265,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 @@ -302,7 +302,7 @@ services: zabbix-agent: build: - context: ./agent/centos + context: ./Dockerfiles/agent/centos cache_from: - centos:centos8 image: zabbix-agent:centos-local @@ -328,7 +328,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -346,7 +346,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/centos + context: ./Dockerfiles/java-gateway/centos cache_from: - centos:centos8 image: zabbix-java-gateway:centos-local @@ -364,7 +364,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -379,7 +379,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/centos + context: ./Dockerfiles/snmptraps/centos cache_from: - centos:centos8 image: zabbix-snmptraps:centos-local @@ -424,7 +424,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 @@ -482,18 +482,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 21c0b8ecc..675faae07 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -15,9 +15,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -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 @@ -91,8 +91,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 @@ -140,9 +140,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,9 +178,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -190,8 +190,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,9 +232,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -244,8 +244,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 @@ -300,7 +300,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -332,7 +332,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -386,7 +386,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 @@ -404,11 +404,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -469,12 +469,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 85e278557..9c1d714c3 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-pgsql/centos + context: ./Dockerfiles/server-pgsql/centos cache_from: - centos:centos8 image: zabbix-server-pgsql:centos-local @@ -19,9 +19,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -36,8 +36,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 @@ -68,7 +68,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/centos + context: ./Dockerfiles/proxy-sqlite3/centos cache_from: - centos:centos8 image: zabbix-proxy-sqlite3:centos-local @@ -99,8 +99,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 @@ -121,7 +121,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/centos + context: ./Dockerfiles/proxy-mysql/centos cache_from: - centos:centos8 image: zabbix-proxy-mysql:centos-local @@ -152,9 +152,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 @@ -180,7 +180,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/centos + context: ./Dockerfiles/web-apache-pgsql/centos cache_from: - centos:centos8 image: zabbix-web-apache-pgsql:centos-local @@ -194,9 +194,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -206,8 +206,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 @@ -240,7 +240,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/centos + context: ./Dockerfiles/web-nginx-pgsql/centos cache_from: - centos:centos8 image: zabbix-web-nginx-pgsql:centos-local @@ -252,9 +252,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -264,8 +264,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 @@ -298,7 +298,7 @@ services: zabbix-agent: build: - context: ./agent/centos + context: ./Dockerfiles/agent/centos cache_from: - centos:centos8 image: zabbix-agent:centos-local @@ -324,7 +324,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -342,7 +342,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/centos + context: ./Dockerfiles/java-gateway/centos cache_from: - centos:centos8 image: zabbix-java-gateway:centos-local @@ -360,7 +360,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -375,7 +375,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/centos + context: ./Dockerfiles/snmptraps/centos cache_from: - centos:centos8 image: zabbix-snmptraps:centos-local @@ -418,7 +418,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 @@ -436,11 +436,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -501,12 +501,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_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index 7bf1fa1ae..b8f7aa98b 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -29,8 +29,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 @@ -92,8 +92,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 @@ -141,9 +141,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 @@ -191,8 +191,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 @@ -245,8 +245,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 @@ -304,7 +304,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -336,7 +336,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -392,7 +392,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 @@ -450,18 +450,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index bed20ee07..9fbb3ffee 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-mysql/ol + context: ./Dockerfiles/server-mysql/ol cache_from: - oraclelinux:8 image: zabbix-server-mysql:ol-local @@ -33,8 +33,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 @@ -69,7 +69,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ol + context: ./Dockerfiles/proxy-sqlite3/ol cache_from: - oraclelinux:8 image: zabbix-proxy-sqlite3:ol-local @@ -100,8 +100,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 @@ -122,7 +122,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ol + context: ./Dockerfiles/proxy-mysql/ol cache_from: - oraclelinux:8 image: zabbix-proxy-mysql:ol-local @@ -153,9 +153,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 @@ -184,7 +184,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/ol + context: ./Dockerfiles/web-apache-mysql/ol cache_from: - oraclelinux:8 image: zabbix-web-apache-mysql:ol-local @@ -207,8 +207,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 @@ -244,7 +244,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/ol + context: ./Dockerfiles/web-nginx-mysql/ol cache_from: - oraclelinux:8 image: zabbix-web-nginx-mysql:ol-local @@ -265,8 +265,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 @@ -302,7 +302,7 @@ services: zabbix-agent: build: - context: ./agent/ol + context: ./Dockerfiles/agent/ol cache_from: - oraclelinux:8 image: zabbix-agent:ol-local @@ -328,7 +328,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -346,7 +346,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ol + context: ./Dockerfiles/java-gateway/ol cache_from: - oraclelinux:8 image: zabbix-java-gateway:ol-local @@ -364,7 +364,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -379,7 +379,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ol + context: ./Dockerfiles/snmptraps/ol cache_from: - oraclelinux:8 image: zabbix-snmptraps:ol-local @@ -424,7 +424,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 @@ -482,18 +482,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index 643fba3aa..3eb446666 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -15,9 +15,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -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 @@ -91,8 +91,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 @@ -140,9 +140,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,9 +178,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -190,8 +190,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,9 +232,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -244,8 +244,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 @@ -300,7 +300,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -332,7 +332,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -386,7 +386,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 @@ -404,11 +404,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -469,12 +469,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_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index 7b3fcefe0..a2d1f8ac4 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-pgsql/ol + context: ./Dockerfiles/server-pgsql/ol cache_from: - oraclelinux:8-slim image: zabbix-server-pgsql:ol-local @@ -19,9 +19,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -36,8 +36,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 @@ -68,7 +68,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ol + context: ./Dockerfiles/proxy-sqlite3/ol cache_from: - oraclelinux:8-slim image: zabbix-proxy-sqlite3:ol-local @@ -99,8 +99,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 @@ -121,7 +121,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ol + context: ./Dockerfiles/proxy-mysql/ol cache_from: - oraclelinux:8-slim image: zabbix-proxy-mysql:ol-local @@ -152,9 +152,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 @@ -180,7 +180,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/ol + context: ./Dockerfiles/web-apache-pgsql/ol cache_from: - oraclelinux:8-slim image: zabbix-web-apache-pgsql:ol-local @@ -194,9 +194,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -206,8 +206,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 @@ -240,7 +240,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/ol + context: ./Dockerfiles/web-nginx-pgsql/ol cache_from: - oraclelinux:8-slim image: zabbix-web-nginx-pgsql:ol-local @@ -252,9 +252,9 @@ services: - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -264,8 +264,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 @@ -298,7 +298,7 @@ services: zabbix-agent: build: - context: ./agent/ol + context: ./Dockerfiles/agent/ol cache_from: - oraclelinux:8-slim image: zabbix-agent:ol-local @@ -324,7 +324,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -342,7 +342,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ol + context: ./Dockerfiles/java-gateway/ol cache_from: - oraclelinux:8-slim image: zabbix-java-gateway:ol-local @@ -360,7 +360,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -375,7 +375,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ol + context: ./Dockerfiles/snmptraps/ol cache_from: - oraclelinux:8-slim image: zabbix-snmptraps:ol-local @@ -418,7 +418,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 @@ -436,11 +436,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -501,12 +501,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 29e392f77..ca4e756a0 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_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 @@ -90,8 +90,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 @@ -138,9 +138,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: @@ -185,8 +185,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 @@ -238,8 +238,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 @@ -296,7 +296,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -328,7 +328,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -384,7 +384,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 @@ -442,18 +442,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 103da7a0a..84d96e869 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:focal image: zabbix-server-mysql:ubuntu-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 @@ -68,7 +68,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ubuntu + context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - ubuntu:focal image: zabbix-proxy-sqlite3:ubuntu-local @@ -98,8 +98,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 @@ -120,7 +120,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ubuntu + context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - ubuntu:focal image: zabbix-proxy-mysql:ubuntu-local @@ -150,9 +150,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 @@ -181,7 +181,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/ubuntu + context: ./Dockerfiles/web-apache-mysql/ubuntu cache_from: - ubuntu:focal image: zabbix-web-apache-mysql:ubuntu-local @@ -203,8 +203,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 @@ -240,7 +240,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/ubuntu + context: ./Dockerfiles/web-nginx-mysql/ubuntu cache_from: - ubuntu:focal image: zabbix-web-nginx-mysql:ubuntu-local @@ -260,8 +260,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 @@ -297,7 +297,7 @@ services: zabbix-agent: build: - context: ./agent/ubuntu + context: ./Dockerfiles/agent/ubuntu cache_from: - ubuntu:focal image: zabbix-agent:ubuntu-local @@ -322,7 +322,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -340,7 +340,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ubuntu + context: ./Dockerfiles/java-gateway/ubuntu cache_from: - ubuntu:focal image: zabbix-java-gateway:ubuntu-local @@ -358,7 +358,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: zabbix-snmptraps: build: - context: ./snmptraps/ubuntu + context: ./Dockerfiles/snmptraps/ubuntu cache_from: - ubuntu:focal image: zabbix-snmptraps:ubuntu-local @@ -418,7 +418,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 @@ -476,18 +476,18 @@ 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 # client-key.pem: -# file: ./.ZBX_DB_KEY_FILE +# file: ./env_vars/.ZBX_DB_KEY_FILE # client-cert.pem: -# file: ./.ZBX_DB_CERT_FILE +# file: ./env_vars/.ZBX_DB_CERT_FILE # root-ca.pem: -# file: ./.ZBX_DB_CA_FILE +# file: ./env_vars/.ZBX_DB_CA_FILE # server-cert.pem: -# file: ./.DB_CERT_FILE +# file: ./env_vars/.DB_CERT_FILE # server-key.pem: -# file: ./.DB_KEY_FILE +# file: ./env_vars/.DB_KEY_FILE diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 1caae435e..ba6485f31 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -14,9 +14,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -31,8 +31,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 @@ -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 @@ -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 secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -174,9 +174,9 @@ services: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -186,8 +186,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,9 +227,9 @@ services: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -239,8 +239,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 @@ -294,7 +294,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -326,7 +326,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -380,7 +380,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 @@ -398,11 +398,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -463,12 +463,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 96a3ee09f..535d11f8f 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -2,7 +2,7 @@ version: '3.5' services: zabbix-server: build: - context: ./server-pgsql/ubuntu + context: ./Dockerfiles/server-pgsql/ubuntu cache_from: - ubuntu:focal image: zabbix-server-pgsql:ubuntu-local @@ -18,9 +18,9 @@ services: - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro ulimits: nproc: 65535 nofile: @@ -35,8 +35,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 @@ -67,7 +67,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ubuntu + context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - ubuntu:focal image: zabbix-proxy-sqlite3:ubuntu-local @@ -97,8 +97,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 @@ -119,7 +119,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ubuntu + context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - ubuntu:focal image: zabbix-proxy-mysql:ubuntu-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 secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -177,7 +177,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/ubuntu + context: ./Dockerfiles/web-apache-pgsql/ubuntu cache_from: - ubuntu:focal image: zabbix-web-apache-pgsql:ubuntu-local @@ -190,9 +190,9 @@ services: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -202,8 +202,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 @@ -236,7 +236,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/ubuntu + context: ./Dockerfiles/web-nginx-pgsql/ubuntu cache_from: - ubuntu:focal image: zabbix-web-nginx-pgsql:ubuntu-local @@ -247,9 +247,9 @@ services: - /etc/localtime:/etc/localtime:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro -# - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro -# - ./.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro -# - ./.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro +# - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro +# - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro deploy: resources: limits: @@ -259,8 +259,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 @@ -293,7 +293,7 @@ services: zabbix-agent: build: - context: ./agent/ubuntu + context: ./Dockerfiles/agent/ubuntu cache_from: - ubuntu:focal image: zabbix-agent:ubuntu-local @@ -318,7 +318,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" networks: @@ -336,7 +336,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ubuntu + context: ./Dockerfiles/java-gateway/ubuntu cache_from: - ubuntu:focal image: zabbix-java-gateway:ubuntu-local @@ -354,7 +354,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java networks: zbx_net_backend: aliases: @@ -369,7 +369,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ubuntu + context: ./Dockerfiles/snmptraps/ubuntu cache_from: - ubuntu:focal image: zabbix-snmptraps:ubuntu-local @@ -412,7 +412,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 @@ -430,11 +430,11 @@ services: # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem volumes: - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw - - ./.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - - ./.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - - ./.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro + - ./env_vars/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro + - ./env_vars/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro + - ./env_vars/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - - .env_db_pgsql + - ./env_vars/.env_db_pgsql secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -495,12 +495,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/ol/build.sh b/java-gateway/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/java-gateway/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/java-gateway/rhel/build.sh b/java-gateway/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/java-gateway/rhel/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 ae063e79b..3918eae66 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/ol/build.sh b/proxy-mysql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-mysql/rhel/build.sh b/proxy-mysql/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-mysql/rhel/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/ol/build.sh b/proxy-sqlite3/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-sqlite3/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/rhel/build.sh b/proxy-sqlite3/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/proxy-sqlite3/rhel/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/ol/build.sh b/server-mysql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/server-mysql/rhel/build.sh b/server-mysql/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-mysql/rhel/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/ol/build.sh b/server-pgsql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/server-pgsql/ol/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/ol/build.sh b/snmptraps/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/snmptraps/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/snmptraps/rhel/build.sh b/snmptraps/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/snmptraps/rhel/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/ol/build.sh b/web-apache-mysql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-mysql/ol/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/ol/build.sh b/web-apache-pgsql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-apache-pgsql/ol/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/ol/build.sh b/web-nginx-mysql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/rhel/build.sh b/web-nginx-mysql/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-mysql/rhel/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/ol/build.sh b/web-nginx-pgsql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-nginx-pgsql/ol/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