diff --git a/.github/workflows/Azure.yml b/.github/workflows/Azure.yml deleted file mode 100644 index 64e50e29f..000000000 --- a/.github/workflows/Azure.yml +++ /dev/null @@ -1,146 +0,0 @@ -name: Build images (Azure) - -on: - release: - types: - - published - push: - branches: - - '5.0' - - '5.4' - paths-ignore: - - '.env*' - - 'docker-compose*.yaml' - - '*/rhel/*' - - '*/windows/*' - - "**.md" - -defaults: - run: - shell: bash - -jobs: - build: - timeout-minutes: 70 - strategy: - fail-fast: false - matrix: - build: - - agent - - agent2 - - java-gateway - - proxy-mysql - - proxy-sqlite3 - - server-mysql - - server-pgsql - - snmptraps - - web-apache-mysql - - web-apache-pgsql - - web-nginx-mysql - - web-nginx-pgsql - - web-service - os: - - alpine - - ubuntu - - ol - - runs-on: ubuntu-20.04 - steps: - - - uses: actions/checkout@v2 - - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to Azure Container Registry - uses: docker/login-action@v1 - with: - registry: ${{ secrets.azure_registry }}.azurecr.io - username: ${{ secrets.AZURE_USERNAME }} - password: ${{ secrets.AZURE_PASSWORD }} - - - name: Prepare platform list - id: platform - run: | - DOCKER_PLATFORM="linux/amd64,linux/arm64" - echo ::set-output name=list::${DOCKER_PLATFORM} - - - name: Prepare environment (push) - if: github.event_name == 'push' - id: prepare_push - run: | - TAGS_ARRAY=() - - IMAGE_NAME="${{ secrets.azure_registry }}.azurecr.io/${{ matrix.os }}/zabbix-${{ matrix.build }}" - GIT_BRANCH="${GITHUB_REF##*/}" - - if [ "${GIT_BRANCH}" == "trunk" ]; then - TAGS_ARRAY+=("$IMAGE_NAME:trunk") - else - GIT_BRANCH=`expr "${GIT_BRANCH}" : '\([0-9]*\.[0-9]*\).*'` - TAGS_ARRAY+=("$IMAGE_NAME:v${GIT_BRANCH}") - fi - - echo "::debug::Branch - ${GIT_BRANCH}" - - TAGS=$(printf -- "%s, " "${TAGS_ARRAY[@]}") - - echo "::debug::Tags - ${TAGS}" - - echo ::set-output name=image_name::${IMAGE_NAME} - echo ::set-output name=image_tag_versions::$(printf -- "%s," "${TAGS_ARRAY[@]}") - - - name: Prepare environment (release) - if: github.event_name == 'release' && github.event.action == 'published' - id: prepare_release - run: | - TAGS_ARRAY=() - - IMAGE_NAME="${{ secrets.azure_registry }}.azurecr.io/${{ matrix.os }}/zabbix-${{ matrix.build }}" - RELEASE_VERSION=${GITHUB_REF##*/} - GIT_BRANCH="${GITHUB_REF##*/}" - GIT_BRANCH=`expr "${GIT_BRANCH}" : '\([0-9]*\.[0-9]*\).*'` - - echo "::debug::Release version ${RELEASE_VERSION}. Branch ${GIT_BRANCH}" - - TAGS_ARRAY+=("$IMAGE_NAME:v${RELEASE_VERSION}") - - TAGS=$(printf -- "--tag %s " "${TAGS_ARRAY[@]}") - - echo ::set-output name=image_name::${IMAGE_NAME} - echo ::set-output name=image_tag_versions::$(printf -- ",%s" "${TAGS_ARRAY[@]}") - - - name: Prepare tags - id: prepare_tags - run: | - if [ ! -z "${{ steps.prepare_push.outputs.image_tag_versions }}" ]; then - TAGS="${{ steps.prepare_push.outputs.image_tag_versions }}" - IMAGE_NAME="${{ steps.prepare_push.outputs.image_name }}" - elif [ ! -z "${{ steps.prepare_release.outputs.image_tag_versions }}" ]; then - TAGS="${{ steps.prepare_release.outputs.image_tag_versions }}" - IMAGE_NAME="${{ steps.prepare_release.outputs.image_name }}" - else - exit 1 - fi - - echo ::set-output name=image_tag_versions::${TAGS} - echo ::set-output name=image_name::${IMAGE_NAME} - - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: ./${{ matrix.build }}/${{ matrix.os }} - file: ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile - platforms: ${{ steps.platform.outputs.list }} - push: ${{ secrets.AUTO_PUSH_IMAGES }} - tags: ${{ steps.prepare_tags.outputs.image_tag_versions }} - - - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/dockerhub_description.yml b/.github/workflows/dockerhub_description.yml index a64eb4110..e6fb33ba3 100644 --- a/.github/workflows/dockerhub_description.yml +++ b/.github/workflows/dockerhub_description.yml @@ -5,7 +5,7 @@ on: branches: - 'trunk' paths: - - "*/*/README.md" + - "Dockerfiles/*/*/README.md" workflow_dispatch: jobs: @@ -41,4 +41,4 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: ${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }} - readme-filepath: ./${{ matrix.build }}/${{ env.SUBDIR }}/README.md + readme-filepath: ./Dockerfiles/${{ matrix.build }}/${{ env.SUBDIR }}/README.md diff --git a/.github/workflows/build_images.yml b/.github/workflows/images_build.yml similarity index 99% rename from .github/workflows/build_images.yml rename to .github/workflows/images_build.yml index 50c39b0d4..c38e711d2 100644 --- a/.github/workflows/build_images.yml +++ b/.github/workflows/images_build.yml @@ -8,9 +8,9 @@ on: branches: - 'trunk' paths-ignore: - - '.env*' + - 'env_vars/*' - 'docker-compose*.yaml' - - '*/rhel/*' + - 'Dockerfiles/*/rhel/*' - '*/windows/*' - "**.md" 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/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile similarity index 100% rename from agent/windows/Dockerfile rename to Dockerfiles/agent/windows/Dockerfile diff --git a/agent/windows/README.md b/Dockerfiles/agent/windows/README.md similarity index 100% rename from agent/windows/README.md rename to Dockerfiles/agent/windows/README.md diff --git a/agent/windows/docker-entrypoint.ps1 b/Dockerfiles/agent/windows/docker-entrypoint.ps1 similarity index 100% rename from agent/windows/docker-entrypoint.ps1 rename to Dockerfiles/agent/windows/docker-entrypoint.ps1 diff --git a/agent/windows/modbus.vs16.sln b/Dockerfiles/agent/windows/modbus.vs16.sln similarity index 100% rename from agent/windows/modbus.vs16.sln rename to Dockerfiles/agent/windows/modbus.vs16.sln diff --git a/agent/windows/modbus.vs16.vcxproj b/Dockerfiles/agent/windows/modbus.vs16.vcxproj similarity index 100% rename from agent/windows/modbus.vs16.vcxproj rename to Dockerfiles/agent/windows/modbus.vs16.vcxproj diff --git a/agent/windows/modbus.vs16.vcxproj.filters b/Dockerfiles/agent/windows/modbus.vs16.vcxproj.filters similarity index 100% rename from agent/windows/modbus.vs16.vcxproj.filters rename to Dockerfiles/agent/windows/modbus.vs16.vcxproj.filters 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/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile similarity index 100% rename from agent2/windows/Dockerfile rename to Dockerfiles/agent2/windows/Dockerfile diff --git a/agent2/windows/README.md b/Dockerfiles/agent2/windows/README.md similarity index 100% rename from agent2/windows/README.md rename to Dockerfiles/agent2/windows/README.md diff --git a/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1 similarity index 100% rename from agent2/windows/docker-entrypoint.ps1 rename to Dockerfiles/agent2/windows/docker-entrypoint.ps1 diff --git a/build-base/alpine/.dockerignore b/Dockerfiles/build-base/alpine/.dockerignore similarity index 100% rename from build-base/alpine/.dockerignore rename to Dockerfiles/build-base/alpine/.dockerignore diff --git a/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile similarity index 100% rename from build-base/alpine/Dockerfile rename to Dockerfiles/build-base/alpine/Dockerfile diff --git a/Dockerfiles/build-base/alpine/build.sh b/Dockerfiles/build-base/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-base/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-base/ol/.dockerignore b/Dockerfiles/build-base/ol/.dockerignore similarity index 100% rename from build-base/ol/.dockerignore rename to Dockerfiles/build-base/ol/.dockerignore diff --git a/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile similarity index 100% rename from build-base/ol/Dockerfile rename to Dockerfiles/build-base/ol/Dockerfile diff --git a/Dockerfiles/build-base/ol/build.sh b/Dockerfiles/build-base/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-base/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/build-base/ubuntu/.dockerignore b/Dockerfiles/build-base/ubuntu/.dockerignore similarity index 100% rename from build-base/ubuntu/.dockerignore rename to Dockerfiles/build-base/ubuntu/.dockerignore diff --git a/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile similarity index 100% rename from build-base/ubuntu/Dockerfile rename to Dockerfiles/build-base/ubuntu/Dockerfile diff --git a/Dockerfiles/build-base/ubuntu/build.sh b/Dockerfiles/build-base/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-base/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-mysql/alpine/.dockerignore b/Dockerfiles/build-mysql/alpine/.dockerignore similarity index 100% rename from build-mysql/alpine/.dockerignore rename to Dockerfiles/build-mysql/alpine/.dockerignore diff --git a/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile similarity index 100% rename from build-mysql/alpine/Dockerfile rename to Dockerfiles/build-mysql/alpine/Dockerfile diff --git a/Dockerfiles/build-mysql/alpine/build.sh b/Dockerfiles/build-mysql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-mysql/ol/.dockerignore b/Dockerfiles/build-mysql/ol/.dockerignore similarity index 100% rename from build-mysql/ol/.dockerignore rename to Dockerfiles/build-mysql/ol/.dockerignore diff --git a/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile similarity index 100% rename from build-mysql/ol/Dockerfile rename to Dockerfiles/build-mysql/ol/Dockerfile diff --git a/Dockerfiles/build-mysql/ol/build.sh b/Dockerfiles/build-mysql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-mysql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-mysql/ubuntu/.dockerignore b/Dockerfiles/build-mysql/ubuntu/.dockerignore similarity index 100% rename from build-mysql/ubuntu/.dockerignore rename to Dockerfiles/build-mysql/ubuntu/.dockerignore diff --git a/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile similarity index 100% rename from build-mysql/ubuntu/Dockerfile rename to Dockerfiles/build-mysql/ubuntu/Dockerfile diff --git a/Dockerfiles/build-mysql/ubuntu/build.sh b/Dockerfiles/build-mysql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-pgsql/alpine/.dockerignore b/Dockerfiles/build-pgsql/alpine/.dockerignore similarity index 100% rename from build-pgsql/alpine/.dockerignore rename to Dockerfiles/build-pgsql/alpine/.dockerignore diff --git a/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile similarity index 100% rename from build-pgsql/alpine/Dockerfile rename to Dockerfiles/build-pgsql/alpine/Dockerfile diff --git a/Dockerfiles/build-pgsql/alpine/build.sh b/Dockerfiles/build-pgsql/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-pgsql/ol/.dockerignore b/Dockerfiles/build-pgsql/ol/.dockerignore similarity index 100% rename from build-pgsql/ol/.dockerignore rename to Dockerfiles/build-pgsql/ol/.dockerignore diff --git a/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile similarity index 100% rename from build-pgsql/ol/Dockerfile rename to Dockerfiles/build-pgsql/ol/Dockerfile diff --git a/Dockerfiles/build-pgsql/ol/build.sh b/Dockerfiles/build-pgsql/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-pgsql/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-pgsql/ubuntu/.dockerignore b/Dockerfiles/build-pgsql/ubuntu/.dockerignore similarity index 100% rename from build-pgsql/ubuntu/.dockerignore rename to Dockerfiles/build-pgsql/ubuntu/.dockerignore diff --git a/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile similarity index 100% rename from build-pgsql/ubuntu/Dockerfile rename to Dockerfiles/build-pgsql/ubuntu/Dockerfile diff --git a/Dockerfiles/build-pgsql/ubuntu/build.sh b/Dockerfiles/build-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-sqlite3/alpine/.dockerignore b/Dockerfiles/build-sqlite3/alpine/.dockerignore similarity index 100% rename from build-sqlite3/alpine/.dockerignore rename to Dockerfiles/build-sqlite3/alpine/.dockerignore diff --git a/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile similarity index 100% rename from build-sqlite3/alpine/Dockerfile rename to Dockerfiles/build-sqlite3/alpine/Dockerfile diff --git a/agent/alpine/build.sh b/Dockerfiles/build-sqlite3/alpine/build.sh similarity index 100% rename from agent/alpine/build.sh rename to Dockerfiles/build-sqlite3/alpine/build.sh diff --git a/build-sqlite3/ol/.dockerignore b/Dockerfiles/build-sqlite3/ol/.dockerignore similarity index 100% rename from build-sqlite3/ol/.dockerignore rename to Dockerfiles/build-sqlite3/ol/.dockerignore diff --git a/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile similarity index 100% rename from build-sqlite3/ol/Dockerfile rename to Dockerfiles/build-sqlite3/ol/Dockerfile diff --git a/Dockerfiles/build-sqlite3/ol/build.sh b/Dockerfiles/build-sqlite3/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/build-sqlite3/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/build-sqlite3/ubuntu/.dockerignore b/Dockerfiles/build-sqlite3/ubuntu/.dockerignore similarity index 100% rename from build-sqlite3/ubuntu/.dockerignore rename to Dockerfiles/build-sqlite3/ubuntu/.dockerignore diff --git a/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile similarity index 100% rename from build-sqlite3/ubuntu/Dockerfile rename to Dockerfiles/build-sqlite3/ubuntu/Dockerfile diff --git a/agent/centos/build.sh b/Dockerfiles/build-sqlite3/ubuntu/build.sh similarity index 100% rename from agent/centos/build.sh rename to Dockerfiles/build-sqlite3/ubuntu/build.sh diff --git a/build-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/build-sqlite3/ubuntu/docker-entrypoint.sh similarity index 100% rename from build-sqlite3/ubuntu/docker-entrypoint.sh rename to Dockerfiles/build-sqlite3/ubuntu/docker-entrypoint.sh 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 100% rename from java-gateway/ol/Dockerfile rename to Dockerfiles/java-gateway/ol/Dockerfile 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/web-service/alpine/.dockerignore b/Dockerfiles/web-service/alpine/.dockerignore similarity index 100% rename from web-service/alpine/.dockerignore rename to Dockerfiles/web-service/alpine/.dockerignore diff --git a/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile similarity index 100% rename from web-service/alpine/Dockerfile rename to Dockerfiles/web-service/alpine/Dockerfile diff --git a/web-service/alpine/README.md b/Dockerfiles/web-service/alpine/README.md similarity index 100% rename from web-service/alpine/README.md rename to Dockerfiles/web-service/alpine/README.md diff --git a/Dockerfiles/web-service/alpine/build.sh b/Dockerfiles/web-service/alpine/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-service/alpine/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-service/alpine/docker-entrypoint.sh b/Dockerfiles/web-service/alpine/docker-entrypoint.sh similarity index 100% rename from web-service/alpine/docker-entrypoint.sh rename to Dockerfiles/web-service/alpine/docker-entrypoint.sh diff --git a/web-service/alpine/hooks/build b/Dockerfiles/web-service/alpine/hooks/build similarity index 100% rename from web-service/alpine/hooks/build rename to Dockerfiles/web-service/alpine/hooks/build diff --git a/web-service/centos/.dockerignore b/Dockerfiles/web-service/centos/.dockerignore similarity index 100% rename from web-service/centos/.dockerignore rename to Dockerfiles/web-service/centos/.dockerignore diff --git a/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile similarity index 100% rename from web-service/centos/Dockerfile rename to Dockerfiles/web-service/centos/Dockerfile diff --git a/web-service/centos/README.md b/Dockerfiles/web-service/centos/README.md similarity index 100% rename from web-service/centos/README.md rename to Dockerfiles/web-service/centos/README.md diff --git a/Dockerfiles/web-service/centos/build.sh b/Dockerfiles/web-service/centos/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-service/centos/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-service/centos/docker-entrypoint.sh b/Dockerfiles/web-service/centos/docker-entrypoint.sh similarity index 100% rename from web-service/centos/docker-entrypoint.sh rename to Dockerfiles/web-service/centos/docker-entrypoint.sh diff --git a/web-service/centos/hooks/build b/Dockerfiles/web-service/centos/hooks/build similarity index 100% rename from web-service/centos/hooks/build rename to Dockerfiles/web-service/centos/hooks/build diff --git a/web-service/ol/.dockerignore b/Dockerfiles/web-service/ol/.dockerignore similarity index 100% rename from web-service/ol/.dockerignore rename to Dockerfiles/web-service/ol/.dockerignore diff --git a/web-service/ol/Dockerfile b/Dockerfiles/web-service/ol/Dockerfile similarity index 100% rename from web-service/ol/Dockerfile rename to Dockerfiles/web-service/ol/Dockerfile diff --git a/web-service/ol/README.md b/Dockerfiles/web-service/ol/README.md similarity index 100% rename from web-service/ol/README.md rename to Dockerfiles/web-service/ol/README.md diff --git a/Dockerfiles/web-service/ol/build.sh b/Dockerfiles/web-service/ol/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-service/ol/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo similarity index 100% rename from web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo rename to Dockerfiles/web-service/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo diff --git a/web-service/ol/docker-entrypoint.sh b/Dockerfiles/web-service/ol/docker-entrypoint.sh similarity index 100% rename from web-service/ol/docker-entrypoint.sh rename to Dockerfiles/web-service/ol/docker-entrypoint.sh diff --git a/web-service/ol/hooks/build b/Dockerfiles/web-service/ol/hooks/build similarity index 100% rename from web-service/ol/hooks/build rename to Dockerfiles/web-service/ol/hooks/build diff --git a/web-service/rhel/.dockerignore b/Dockerfiles/web-service/rhel/.dockerignore similarity index 100% rename from web-service/rhel/.dockerignore rename to Dockerfiles/web-service/rhel/.dockerignore diff --git a/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile similarity index 100% rename from web-service/rhel/Dockerfile rename to Dockerfiles/web-service/rhel/Dockerfile diff --git a/web-service/rhel/README.md b/Dockerfiles/web-service/rhel/README.md similarity index 100% rename from web-service/rhel/README.md rename to Dockerfiles/web-service/rhel/README.md diff --git a/Dockerfiles/web-service/rhel/build.sh b/Dockerfiles/web-service/rhel/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-service/rhel/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-service/rhel/docker-entrypoint.sh b/Dockerfiles/web-service/rhel/docker-entrypoint.sh similarity index 100% rename from web-service/rhel/docker-entrypoint.sh rename to Dockerfiles/web-service/rhel/docker-entrypoint.sh diff --git a/web-service/rhel/hooks/build b/Dockerfiles/web-service/rhel/hooks/build similarity index 100% rename from web-service/rhel/hooks/build rename to Dockerfiles/web-service/rhel/hooks/build diff --git a/web-service/rhel/licenses/gpl-2.0.txt b/Dockerfiles/web-service/rhel/licenses/gpl-2.0.txt similarity index 100% rename from web-service/rhel/licenses/gpl-2.0.txt rename to Dockerfiles/web-service/rhel/licenses/gpl-2.0.txt diff --git a/web-service/ubuntu/.dockerignore b/Dockerfiles/web-service/ubuntu/.dockerignore similarity index 100% rename from web-service/ubuntu/.dockerignore rename to Dockerfiles/web-service/ubuntu/.dockerignore diff --git a/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile similarity index 100% rename from web-service/ubuntu/Dockerfile rename to Dockerfiles/web-service/ubuntu/Dockerfile diff --git a/web-service/ubuntu/README.md b/Dockerfiles/web-service/ubuntu/README.md similarity index 100% rename from web-service/ubuntu/README.md rename to Dockerfiles/web-service/ubuntu/README.md diff --git a/Dockerfiles/web-service/ubuntu/build.sh b/Dockerfiles/web-service/ubuntu/build.sh new file mode 120000 index 000000000..46b203134 --- /dev/null +++ b/Dockerfiles/web-service/ubuntu/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref b/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref similarity index 100% rename from web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref rename to Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref diff --git a/web-service/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-service/ubuntu/docker-entrypoint.sh similarity index 100% rename from web-service/ubuntu/docker-entrypoint.sh rename to Dockerfiles/web-service/ubuntu/docker-entrypoint.sh diff --git a/web-service/ubuntu/hooks/build b/Dockerfiles/web-service/ubuntu/hooks/build similarity index 100% rename from web-service/ubuntu/hooks/build rename to Dockerfiles/web-service/ubuntu/hooks/build 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/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/build-base/alpine/build.sh b/build-base/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-base/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-base/ol/build.sh b/build-base/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-base/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-base/ubuntu/build.sh b/build-base/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-base/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-mysql/alpine/build.sh b/build-mysql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-mysql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-mysql/ol/build.sh b/build-mysql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-mysql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-mysql/ubuntu/build.sh b/build-mysql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-mysql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-pgsql/alpine/build.sh b/build-pgsql/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-pgsql/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-pgsql/ol/build.sh b/build-pgsql/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-pgsql/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-pgsql/ubuntu/build.sh b/build-pgsql/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-pgsql/ubuntu/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-sqlite3/alpine/build.sh b/build-sqlite3/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-sqlite3/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-sqlite3/ol/build.sh b/build-sqlite3/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-sqlite3/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/build-sqlite3/ubuntu/build.sh b/build-sqlite3/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/build-sqlite3/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 c44739b53..f9360f96a 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: @@ -398,7 +398,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -425,7 +425,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 @@ -483,18 +483,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 d47b713f8..a750481f9 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -2,14 +2,14 @@ version: '3.5' services: zabbix-build-base: build: - context: ./build-base/alpine + context: ./Dockerfiles/build-base/alpine cache_from: - alpine:3.14 image: zabbix-build-base:alpine-local zabbix-build-mysql: build: - context: ./build-mysql/alpine + context: ./Dockerfiles/build-mysql/alpine cache_from: - alpine:3.14 args: @@ -20,7 +20,7 @@ services: zabbix-build-sqlite3: build: - context: ./build-sqlite3/alpine + context: ./Dockerfiles/build-sqlite3/alpine cache_from: - alpine:3.14 args: @@ -31,7 +31,7 @@ services: zabbix-server: build: - context: ./server-mysql/alpine + context: ./Dockerfiles/server-mysql/alpine cache_from: - alpine:3.14 args: @@ -64,8 +64,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 @@ -101,7 +101,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/alpine + context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - alpine:3.14 args: @@ -134,8 +134,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 @@ -157,7 +157,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/alpine + context: ./Dockerfiles/proxy-mysql/alpine cache_from: - alpine:3.14 args: @@ -190,9 +190,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 @@ -222,7 +222,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/alpine + context: ./Dockerfiles/web-apache-mysql/alpine cache_from: - alpine:3.14 args: @@ -247,8 +247,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 @@ -285,7 +285,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/alpine + context: ./Dockerfiles/web-nginx-mysql/alpine cache_from: - alpine:3.14 args: @@ -308,8 +308,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 @@ -346,7 +346,7 @@ services: zabbix-agent: build: - context: ./agent/alpine + context: ./Dockerfiles/agent/alpine cache_from: - alpine:3.14 args: @@ -376,7 +376,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" depends_on: @@ -396,7 +396,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/alpine + context: ./Dockerfiles/java-gateway/alpine cache_from: - alpine:3.14 args: @@ -416,7 +416,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java depends_on: - zabbix-build-mysql networks: @@ -433,7 +433,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/alpine + context: ./Dockerfiles/snmptraps/alpine cache_from: - alpine:3.14 image: zabbix-snmptraps:alpine-local @@ -466,7 +466,7 @@ services: zabbix-web-service: build: - context: ./web-service/alpine + context: ./Dockerfiles/web-service/alpine cache_from: - alpine:3.14 args: @@ -490,7 +490,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service depends_on: - zabbix-build-mysql networks: @@ -519,7 +519,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 @@ -577,18 +577,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 d5af8e648..332cec0fa 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: @@ -394,7 +394,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -419,7 +419,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 @@ -437,11 +437,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 @@ -502,12 +502,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 187def259..bbb0bd252 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -2,14 +2,14 @@ version: '3.5' services: zabbix-build-base: build: - context: ./build-base/alpine + context: ./Dockerfiles/build-base/alpine cache_from: - alpine:3.14 image: zabbix-build-base:alpine-local zabbix-build-pgsql: build: - context: ./build-pgsql/alpine + context: ./Dockerfiles/build-pgsql/alpine cache_from: - alpine:3.14 args: @@ -20,7 +20,7 @@ services: zabbix-build-mysql: build: - context: ./build-mysql/alpine + context: ./Dockerfiles/build-mysql/alpine cache_from: - alpine:3.14 args: @@ -31,7 +31,7 @@ services: zabbix-build-sqlite3: build: - context: ./build-sqlite3/alpine + context: ./Dockerfiles/build-sqlite3/alpine cache_from: - alpine:3.14 args: @@ -42,7 +42,7 @@ services: zabbix-server: build: - context: ./server-pgsql/alpine + context: ./Dockerfiles/server-pgsql/alpine cache_from: - alpine:3.14 args: @@ -78,8 +78,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 @@ -111,7 +111,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/alpine + context: ./Dockerfiles/proxy-sqlite3/alpine cache_from: - alpine:3.14 args: @@ -144,8 +144,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 @@ -167,7 +167,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/alpine + context: ./Dockerfiles/proxy-mysql/alpine cache_from: - alpine:3.14 args: @@ -200,9 +200,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 @@ -229,7 +229,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/alpine + context: ./Dockerfiles/web-apache-pgsql/alpine cache_from: - alpine:3.14 args: @@ -257,8 +257,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 @@ -292,7 +292,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/alpine + context: ./Dockerfiles/web-nginx-pgsql/alpine cache_from: - alpine:3.14 args: @@ -318,8 +318,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 @@ -353,7 +353,7 @@ services: zabbix-agent: build: - context: ./agent/alpine + context: ./Dockerfiles/agent/alpine cache_from: - alpine:3.14 args: @@ -381,7 +381,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" depends_on: @@ -401,7 +401,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/alpine + context: ./Dockerfiles/java-gateway/alpine cache_from: - alpine:3.14 args: @@ -421,7 +421,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java depends_on: - zabbix-build-pgsql networks: @@ -438,7 +438,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/alpine + context: ./Dockerfiles/snmptraps/alpine cache_from: - alpine:3.14 image: zabbix-snmptraps:alpine-local @@ -471,7 +471,7 @@ services: zabbix-web-service: build: - context: ./web-service/alpine + context: ./Dockerfiles/web-service/alpine cache_from: - alpine:3.14 args: @@ -495,7 +495,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service depends_on: - zabbix-build-pgsql networks: @@ -522,7 +522,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 @@ -544,7 +544,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 @@ -605,12 +605,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 9b4df90a9..34bbcdb0f 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: @@ -398,7 +398,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -425,7 +425,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 @@ -483,18 +483,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 00081b131..677976d48 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 @@ -412,7 +412,7 @@ services: zabbix-web-service: build: - context: ./web-service/centos + context: ./Dockerfiles/web-service/centos cache_from: - centos:centos8 image: zabbix-web-service:centos-local @@ -434,7 +434,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -461,7 +461,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 @@ -519,18 +519,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 a4aac3e01..415e57eec 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: @@ -394,7 +394,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -419,7 +419,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 @@ -437,11 +437,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 @@ -502,12 +502,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 e6ef72dac..b16ecd4e9 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: @@ -408,7 +408,7 @@ services: zabbix-web-service: build: - context: ./web-service/centos + context: ./Dockerfiles/web-service/centos cache_from: - centos:centos8 image: zabbix-web-service:centos-local @@ -430,7 +430,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -455,7 +455,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 @@ -473,11 +473,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 @@ -538,12 +538,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 6ef6b6404..73b440f9e 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: @@ -398,7 +398,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -425,7 +425,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 @@ -483,18 +483,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 feaf85525..4f8725c21 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -2,14 +2,14 @@ version: '3.5' services: zabbix-build-base: build: - context: ./build-base/ol + context: ./Dockerfiles/build-base/ol cache_from: - oraclelinux:8-slim image: zabbix-build-base:ol-local zabbix-build-mysql: build: - context: ./build-mysql/ol + context: ./Dockerfiles/build-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -20,7 +20,7 @@ services: zabbix-build-sqlite3: build: - context: ./build-sqlite3/ol + context: ./Dockerfiles/build-sqlite3/ol cache_from: - oraclelinux:8-slim args: @@ -31,7 +31,7 @@ services: zabbix-server: build: - context: ./server-mysql/ol + context: ./Dockerfiles/server-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -64,8 +64,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 @@ -101,7 +101,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ol + context: ./Dockerfiles/proxy-sqlite3/ol cache_from: - oraclelinux:8-slim args: @@ -134,8 +134,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 @@ -157,7 +157,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ol + context: ./Dockerfiles/proxy-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -190,9 +190,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 @@ -222,7 +222,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/ol + context: ./Dockerfiles/web-apache-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -247,8 +247,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 @@ -285,7 +285,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/ol + context: ./Dockerfiles/web-nginx-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -308,8 +308,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 @@ -346,7 +346,7 @@ services: zabbix-agent: build: - context: ./agent/ol + context: ./Dockerfiles/agent/ol cache_from: - oraclelinux:8-slim args: @@ -374,7 +374,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/env_agent privileged: true pid: "host" depends_on: @@ -394,7 +394,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ol + context: ./Dockerfiles/java-gateway/ol cache_from: - oraclelinux:8-slim args: @@ -414,7 +414,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/env_java depends_on: - zabbix-build-mysql networks: @@ -431,7 +431,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ol + context: ./Dockerfiles/snmptraps/ol cache_from: - oraclelinux:8-slim image: zabbix-snmptraps:ol-local @@ -464,7 +464,7 @@ services: zabbix-web-service: build: - context: ./web-service/ol + context: ./Dockerfiles/web-service/ol cache_from: - oraclelinux:8-slim args: @@ -488,7 +488,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/env_web_service depends_on: - zabbix-build-mysql networks: @@ -517,7 +517,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 @@ -575,18 +575,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 4309f02f7..7eca27a98 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_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: @@ -394,7 +394,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/env_web_service networks: zbx_net_backend: aliases: @@ -419,7 +419,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 @@ -437,11 +437,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 @@ -502,12 +502,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 d19ebb926..3275e0b58 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -2,14 +2,14 @@ version: '3.5' services: zabbix-build-base: build: - context: ./build-base/ol + context: ./Dockerfiles/build-base/ol cache_from: - oraclelinux:8-slim image: zabbix-build-base:ol-local zabbix-build-pgsql: build: - context: ./build-pgsql/ol + context: ./Dockerfiles/build-pgsql/ol cache_from: - oraclelinux:8-slim args: @@ -20,7 +20,7 @@ services: zabbix-build-mysql: build: - context: ./build-mysql/ol + context: ./Dockerfiles/build-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -31,7 +31,7 @@ services: zabbix-build-sqlite3: build: - context: ./build-sqlite3/ol + context: ./Dockerfiles/build-sqlite3/ol cache_from: - oraclelinux:8-slim args: @@ -42,7 +42,7 @@ services: zabbix-server: build: - context: ./server-pgsql/ol + context: ./Dockerfiles/server-pgsql/ol cache_from: - oraclelinux:8-slim args: @@ -78,8 +78,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 @@ -111,7 +111,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ol + context: ./Dockerfiles/proxy-sqlite3/ol cache_from: - oraclelinux:8-slim args: @@ -144,8 +144,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 @@ -167,7 +167,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ol + context: ./Dockerfiles/proxy-mysql/ol cache_from: - oraclelinux:8-slim args: @@ -200,9 +200,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 @@ -229,7 +229,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/ol + context: ./Dockerfiles/web-apache-pgsql/ol cache_from: - oraclelinux:8-slim args: @@ -257,8 +257,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 @@ -292,7 +292,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/ol + context: ./Dockerfiles/web-nginx-pgsql/ol cache_from: - oraclelinux:8-slim args: @@ -318,8 +318,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 @@ -353,7 +353,7 @@ services: zabbix-agent: build: - context: ./agent/ol + context: ./Dockerfiles/agent/ol cache_from: - oraclelinux:8-slim args: @@ -381,7 +381,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/env_agent privileged: true pid: "host" depends_on: @@ -401,7 +401,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ol + context: ./Dockerfiles/java-gateway/ol cache_from: - oraclelinux:8-slim args: @@ -421,7 +421,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/env_java depends_on: - zabbix-build-pgsql networks: @@ -438,7 +438,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ol + context: ./Dockerfiles/snmptraps/ol cache_from: - oraclelinux:8-slim image: zabbix-snmptraps:ol-local @@ -471,7 +471,7 @@ services: zabbix-web-service: build: - context: ./web-service/ol + context: ./Dockerfiles/web-service/ol cache_from: - oraclelinux:8-slim args: @@ -495,7 +495,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/env_web_service depends_on: - zabbix-build-pgsql networks: @@ -522,7 +522,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 @@ -540,11 +540,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 @@ -605,12 +605,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 7a543360b..25d6d5a66 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: @@ -390,7 +390,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -417,7 +417,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 @@ -475,18 +475,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 3ae1a1b84..d8d22a02b 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -2,14 +2,14 @@ version: '3.5' services: zabbix-build-base: build: - context: ./build-base/ubuntu + context: ./Dockerfiles/build-base/ubuntu cache_from: - ubuntu:focal image: zabbix-build-base:ubuntu-local zabbix-build-mysql: build: - context: ./build-mysql/ubuntu + context: ./Dockerfiles/build-mysql/ubuntu cache_from: - ubuntu:focal args: @@ -20,7 +20,7 @@ services: zabbix-build-sqlite3: build: - context: ./build-sqlite3/ubuntu + context: ./Dockerfiles/build-sqlite3/ubuntu cache_from: - ubuntu:focal args: @@ -31,7 +31,7 @@ services: zabbix-server: build: - context: ./server-mysql/ubuntu + context: ./Dockerfiles/server-mysql/ubuntu cache_from: - ubuntu:focal args: @@ -63,8 +63,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 @@ -100,7 +100,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ubuntu + context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - ubuntu:focal args: @@ -132,8 +132,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 @@ -155,7 +155,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ubuntu + context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - ubuntu:focal args: @@ -187,9 +187,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 @@ -219,7 +219,7 @@ services: zabbix-web-apache-mysql: build: - context: ./web-apache-mysql/ubuntu + context: ./Dockerfiles/web-apache-mysql/ubuntu cache_from: - ubuntu:focal args: @@ -243,8 +243,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_mysql - - .env_web + - ./env_vars/.env_db_mysql + - ./env_vars/.env_web secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -281,7 +281,7 @@ services: zabbix-web-nginx-mysql: build: - context: ./web-nginx-mysql/ubuntu + context: ./Dockerfiles/web-nginx-mysql/ubuntu cache_from: - ubuntu:focal args: @@ -303,8 +303,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 @@ -341,7 +341,7 @@ services: zabbix-agent: build: - context: ./agent/ubuntu + context: ./Dockerfiles/agent/ubuntu cache_from: - ubuntu:focal args: @@ -368,7 +368,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" depends_on: @@ -388,7 +388,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ubuntu + context: ./Dockerfiles/java-gateway/ubuntu cache_from: - ubuntu:focal args: @@ -408,7 +408,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java depends_on: - zabbix-build-mysql networks: @@ -425,7 +425,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ubuntu + context: ./Dockerfiles/snmptraps/ubuntu cache_from: - ubuntu:focal image: zabbix-snmptraps:ubuntu-local @@ -458,7 +458,7 @@ services: zabbix-web-service: build: - context: ./web-service/ubuntu + context: ./Dockerfiles/web-service/ubuntu cache_from: - ubuntu:focal args: @@ -482,7 +482,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service depends_on: - zabbix-build-mysql networks: @@ -511,7 +511,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 @@ -569,18 +569,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 dc243f4f7..746b24d44 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: @@ -388,7 +388,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service networks: zbx_net_backend: aliases: @@ -413,7 +413,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 @@ -431,11 +431,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 @@ -496,12 +496,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 9f813c329..41ad4d8a4 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -42,7 +42,7 @@ services: zabbix-server: build: - context: ./server-pgsql/ubuntu + context: ./Dockerfiles/server-pgsql/ubuntu cache_from: - ubuntu:focal args: @@ -60,9 +60,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: @@ -77,8 +77,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 @@ -110,7 +110,7 @@ services: zabbix-proxy-sqlite3: build: - context: ./proxy-sqlite3/ubuntu + context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - ubuntu:focal args: @@ -142,8 +142,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 @@ -165,7 +165,7 @@ services: zabbix-proxy-mysql: build: - context: ./proxy-mysql/ubuntu + context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - ubuntu:focal args: @@ -197,9 +197,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 @@ -226,7 +226,7 @@ services: zabbix-web-apache-pgsql: build: - context: ./web-apache-pgsql/ubuntu + context: ./Dockerfiles/web-apache-pgsql/ubuntu cache_from: - ubuntu:focal args: @@ -241,9 +241,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: @@ -253,8 +253,8 @@ services: cpus: '0.5' memory: 256M env_file: - - .env_db_pgsql - - .env_web + - ./env_vars/.env_db_pgsql + - ./env_vars/.env_web secrets: - POSTGRES_USER - POSTGRES_PASSWORD @@ -288,7 +288,7 @@ services: zabbix-web-nginx-pgsql: build: - context: ./web-nginx-pgsql/ubuntu + context: ./Dockerfiles/web-nginx-pgsql/ubuntu cache_from: - ubuntu:focal args: @@ -301,9 +301,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: @@ -313,8 +313,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 @@ -348,7 +348,7 @@ services: zabbix-agent: build: - context: ./agent/ubuntu + context: ./Dockerfiles/agent/ubuntu cache_from: - ubuntu:focal args: @@ -375,7 +375,7 @@ services: memory: 64M mode: global env_file: - - .env_agent + - ./env_vars/.env_agent privileged: true pid: "host" depends_on: @@ -395,7 +395,7 @@ services: zabbix-java-gateway: build: - context: ./java-gateway/ubuntu + context: ./Dockerfiles/java-gateway/ubuntu cache_from: - ubuntu:focal args: @@ -415,7 +415,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_java + - ./env_vars/.env_java depends_on: - zabbix-build-pgsql networks: @@ -432,7 +432,7 @@ services: zabbix-snmptraps: build: - context: ./snmptraps/ubuntu + context: ./Dockerfiles/snmptraps/ubuntu cache_from: - ubuntu:focal image: zabbix-snmptraps:ubuntu-local @@ -465,7 +465,7 @@ services: zabbix-web-service: build: - context: ./web-service/ubuntu + context: ./Dockerfiles/web-service/ubuntu cache_from: - ubuntu:focal args: @@ -489,7 +489,7 @@ services: cpus: '0.25' memory: 256M env_file: - - .env_web_service + - ./env_vars/.env_web_service depends_on: - zabbix-build-pgsql networks: @@ -516,7 +516,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 @@ -534,11 +534,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 @@ -599,12 +599,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/.env_web_service b/env_vars/.env_web_service similarity index 100% rename from .env_web_service rename to env_vars/.env_web_service 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 3f3df6626..61a5859fd 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/web-service/alpine/build.sh b/web-service/alpine/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-service/alpine/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-service/centos/build.sh b/web-service/centos/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-service/centos/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-service/ol/build.sh b/web-service/ol/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-service/ol/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-service/rhel/build.sh b/web-service/rhel/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-service/rhel/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../build.sh \ No newline at end of file diff --git a/web-service/ubuntu/build.sh b/web-service/ubuntu/build.sh deleted file mode 120000 index fcb4d4ee7..000000000 --- a/web-service/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