Optimized structure for Dockerfiles

.github/workflows/dockerhub_description.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - 'trunk'
     paths:
-      - "*/*/README.md"
+      - "Dockerfiles/*/*/README.md"
   workflow_dispatch:
 
 jobs:
@@ -36,9 +36,9 @@ jobs:
         uses: actions/checkout@v2
       -
         name: Update DockerHub repo description
-        uses: peter-evans/dockerhub-description@v2
+        uses: peter-evans/dockerhub-description@v2.4.3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: ${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }}
-          readme-filepath: ./${{ matrix.build }}/${{ env.SUBDIR }}/README.md
+          readme-filepath: ./Dockerfiles/${{ matrix.build }}/${{ env.SUBDIR }}/README.md

.github/workflows/images_build.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Images build
 
 on:
   release:
@@ -8,13 +8,12 @@ on:
     branches:
       - '4.0'
       - '5.0'
-      - '5.2'
       - '5.4'
       - 'trunk'
     paths-ignore:
-      - '.env*'
+      - 'env_vars/*'
       - 'docker-compose*.yaml'
-      - '*/rhel/*'
+      - 'Dockerfiles/*/rhel/*'
       - "**.md"
 
 defaults:
@@ -174,8 +173,8 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          context: ./${{ matrix.build }}/${{ matrix.os }}
+          context: ./Dockerfiles/${{ matrix.build }}/${{ matrix.os }}
-          file: ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile
+          file: ./Dockerfiles/${{ matrix.build }}/${{ matrix.os }}/Dockerfile
           platforms: ${{ steps.platform.outputs.list }}
           push: ${{ secrets.AUTO_PUSH_IMAGES }}
           tags: ${{ steps.prepare_tags.outputs.image_tag_versions }}

Dockerfiles/agent/alpine/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent/centos/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent/ol/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent/rhel/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent/ubuntu/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent2/alpine/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent2/ol/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent2/rhel/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/agent2/ubuntu/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/java-gateway/alpine/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/java-gateway/centos/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/java-gateway/ol/Dockerfile

@@ -40,8 +40,6 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
       org.opencontainers.image.version="${ZBX_VERSION}" \
       org.opencontainers.image.source="${ZBX_SOURCES}"
 
-COPY ["conf/etc/", "/etc/"]
-
 RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
     INSTALL_PKGS="autoconf \
             automake \

Dockerfiles/java-gateway/ol/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/java-gateway/rhel/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/java-gateway/ubuntu/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/proxy-mysql/alpine/build.sh

@@ -0,0 +1 @@
+../../../build.sh

Dockerfiles/proxy-mysql/centos/build.sh

@@ -0,0 +1 @@
+../../../build.sh