From 0e5e2176de16305d9ef07f1c1177d67329554346 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Tue, 16 Jul 2024 22:48:12 +0200
Subject: [PATCH 1/4] missing GM.pm in image v4 Fixes #258

---
 .github/workflows/build.yml   |  4 +--
 Dockerfile-bullseye           | 61 ++++++++++++++++++-----------------
 Dockerfile-threaded-bullseye  | 32 +++++++++---------
 scripts/excluded_packages.txt |  1 -
 4 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4feba5c..71b5c3e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -453,7 +453,7 @@ jobs:
           load: false  
           file: ./Dockerfile${{ matrix.dockerfile }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'publishImage') }}
           target: with-fhem-extended-python-nodejs
           cache-from: | 
             type=gha,scope=base-cpan_linux/386-${{ matrix.dockerfile }}
@@ -500,7 +500,7 @@ jobs:
           load: false  
           file: ./Dockerfile${{ matrix.dockerfile }}
           platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,386
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'publishImage') }}
           target: with-fhem
           cache-from: | 
             type=gha,scope=base_linux/arm64-${{ matrix.dockerfile }}
diff --git a/Dockerfile-bullseye b/Dockerfile-bullseye
index 3b40b26..6836419 100644
--- a/Dockerfile-bullseye
+++ b/Dockerfile-bullseye
@@ -2,7 +2,7 @@
 # 
 # base layer with perl and some general preparations
 #
-FROM perl:5.36.3-slim-bullseye as base
+FROM perl:5.36.3-slim-bullseye AS base
 
 ARG TARGETPLATFORM
 
@@ -46,7 +46,7 @@ EOF
 # Install all CPAN Modules, needed from FHEM and standard modules
 #
 
-FROM perl:5.36.3-bullseye as build-cpan 
+FROM perl:5.36.3-bullseye AS build-cpan 
 
 COPY cpanfile /usr/src/app/core/cpanfile
 
@@ -56,6 +56,7 @@ RUN <<EOF
   LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \
       libusb-dev \
       graphviz \
+      libgd-dev \
       python3-dev  
   LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean 
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*
@@ -66,7 +67,7 @@ EOF
 # Install Modules from CPAN
 #
 
-# JSON::XS isn't marked as compatible with Perl 5.36, we prevent some output
+# JSON::XS isn't marked AS compatible with Perl 5.36, we prevent some output
 ENV PERL_CANARY_STABILITY_NOPROMPT=1 
 RUN <<EOF
   if [ "${TARGETPLATFORM}" != "linux/amd64" ] && [ "${TARGETPLATFORM}" != "linux/i386" ]; then 
@@ -74,6 +75,7 @@ RUN <<EOF
   fi
   
   cpm install --without-test --with-suggests --with-recommends --cpanfile /usr/src/app/core/cpanfile --show-build-log-on-failure --configure-timeout=360 --workers=$(nproc) --local-lib-contained core/
+  
   rm -rf /root/.cpanm 
   rm -rf /root/.perl-cpm/
   rm -rf /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*
@@ -109,7 +111,7 @@ RUN <<EOF
 EOF
 
 
-FROM base as base-cpan 
+FROM base AS base-cpan 
 
 RUN <<EOF
     LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update 
@@ -154,7 +156,7 @@ COPY --from=build-cpan /usr/src/app/core/lib/perl5 /usr/src/app/core/lib/perl5
 #
 # Standard FHEM Layer
 #
-FROM base-cpan as with-fhem
+FROM base-cpan AS with-fhem
 
 ENV PERL5LIB=/usr/src/app/core/lib/perl5
 
@@ -177,7 +179,7 @@ ENV LOGFILE=./log/fhem-%Y-%m-%d.log \
    CONFIGTYPE=fhem.cfg
 
 # Moved AGS to the end, because it changes every run and invalidates the cache for all following steps  https://github.com/moby/moby/issues/20136
-# Arguments to instantiate as variables
+# Arguments to instantiate AS variables
 ARG PLATFORM="linux"
 ARG TAG=""
 ARG IMAGE_VCS_REF=""
@@ -202,29 +204,28 @@ ARG L_VENDOR_FHEM="FHEM e.V."
 ARG L_LICENSES_FHEM="GPL-2.0"
 ARG L_DESCR_FHEM="FHEM (TM) is a GPL'd perl server for house automation. It is used to automate some common tasks in the household like switching lamps / shutters / heating / etc. and to log events like temperature / humidity / power consumption."
 
-
 # non-standard labels
-LABEL org.fhem.authors ${L_AUTHORS_FHEM} \
-   org.fhem.url ${L_URL_FHEM} \
-   org.fhem.documentation ${L_USAGE_FHEM} \
-   org.fhem.source ${L_VCS_URL_FHEM} \
-   org.fhem.vendor ${L_VENDOR_FHEM} \
-   org.fhem.licenses ${L_LICENSES_FHEM} \
-   org.fhem.description ${L_DESCR_FHEM}
+LABEL org.fhem.authors=${L_AUTHORS_FHEM}
+LABEL org.fhem.url=${L_URL_FHEM}
+LABEL org.fhem.documentation=${L_USAGE_FHEM}
+LABEL org.fhem.source=${L_VCS_URL_FHEM}
+LABEL org.fhem.vendor=${L_VENDOR_FHEM}
+LABEL org.fhem.licenses=${L_LICENSES_FHEM}
+LABEL org.fhem.description=${L_DESCR_FHEM}
 
 # annotation labels according to
 # https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md#pre-defined-annotation-keys
-LABEL org.opencontainers.image.created ${BUILD_DATE} \
-   org.opencontainers.image.authors ${L_AUTHORS} \
-   org.opencontainers.image.url ${L_URL} \
-   org.opencontainers.image.documentation ${L_USAGE} \
-   org.opencontainers.image.source ${L_VCS_URL} \
-   org.opencontainers.image.version ${IMAGE_VERSION} \
-   org.opencontainers.image.revision ${IMAGE_VCS_REF} \
-   org.opencontainers.image.vendor ${L_VENDOR} \
-   org.opencontainers.image.licenses ${L_LICENSES} \
-   org.opencontainers.image.title ${L_TITLE} 
-LABEL org.opencontainers.image.description ${L_DESCR}
+LABEL org.opencontainers.image.created=${BUILD_DATE}
+LABEL org.opencontainers.image.authors=${L_AUTHORS}
+LABEL org.opencontainers.image.url=${L_URL}
+LABEL org.opencontainers.image.documentation=${L_USAGE}
+LABEL org.opencontainers.image.source=${L_VCS_URL}
+LABEL org.opencontainers.image.version=${IMAGE_VERSION}
+LABEL org.opencontainers.image.revision=${IMAGE_VCS_REF}
+LABEL org.opencontainers.image.vendor=${L_VENDOR}
+LABEL org.opencontainers.image.licenses=${L_LICENSES}
+LABEL org.opencontainers.image.title=${L_TITLE} 
+LABEL org.opencontainers.image.description=${L_DESCR}
 
 RUN chmod 755 /*.sh /usr/local/bin/* \ 
     && echo "org.opencontainers.image.created=${BUILD_DATE}\norg.opencontainers.image.authors=${L_AUTHORS}\norg.opencontainers.image.url=${L_URL}\norg.opencontainers.image.documentation=${L_USAGE}\norg.opencontainers.image.source=${L_VCS_URL}\norg.opencontainers.image.version=${IMAGE_VERSION}\norg.opencontainers.image.revision=${IMAGE_VCS_REF}\norg.opencontainers.image.vendor=${L_VENDOR}\norg.opencontainers.image.licenses=${L_LICENSES}\norg.opencontainers.image.title=${L_TITLE}\norg.opencontainers.image.description=${L_DESCR}\norg.fhem.authors=${L_AUTHORS_FHEM}\norg.fhem.url=${L_URL_FHEM}\norg.fhem.documentation=${L_USAGE_FHEM}\norg.fhem.source=${L_VCS_URL_FHEM}\norg.fhem.version=${FHEM_VERSION}\norg.fhem.vendor=${L_VENDOR_FHEM}\norg.fhem.licenses=${L_LICENSES_FHEM}\norg.fhem.description=${L_DESCR_FHEM}" > /image_info
@@ -245,7 +246,7 @@ CMD [ "start" ]
 # Add additional Perl and System layers
 #
 
-FROM with-fhem as with-fhem-extended
+FROM with-fhem AS with-fhem-extended
 
 ENV PERL5LIB=${PERL5LIB}:/usr/src/app/3rdparty/lib/perl5
 
@@ -279,7 +280,7 @@ COPY --from=build-cpan /usr/src/app/3rdparty/lib/perl5 /usr/src/app/3rdparty/lib
 # Add additional Python layer
 #
 
-FROM with-fhem-extended as with-fhem-extended-python
+FROM with-fhem-extended AS with-fhem-extended-python
 
 RUN <<EOF 
     LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update 
@@ -300,7 +301,7 @@ EOF
 #
 # Add nodejs app layer
 #
-FROM with-fhem-extended-python as with-fhem-extended-python-nodejs
+FROM with-fhem-extended-python AS with-fhem-extended-python-nodejs
 
 ARG IMAGE_LAYER_NODEJS_EXT="0"
 
@@ -329,7 +330,7 @@ EOF
 # Layer only for bash unit testing
 #
 #
-FROM with-fhem as with-fhem-bats
+FROM with-fhem AS with-fhem-bats
 
 ADD https://github.com/bats-core/bats-core.git#v1.10.0 /tmp/bats
 RUN <<EOF
@@ -353,7 +354,7 @@ ENTRYPOINT [ "/usr/local/bin/bats" ]
 # Layer for bash integration testing
 #
 #
-FROM with-fhem-extended-python-nodejs as with-fhem-bats-extended-python-nodejs
+FROM with-fhem-extended-python-nodejs AS with-fhem-bats-extended-python-nodejs
 
 COPY --from=with-fhem-bats /opt/bats /opt/bats/
 RUN ln -s /opt/bats/bin/bats /usr/local/bin/bats 
diff --git a/Dockerfile-threaded-bullseye b/Dockerfile-threaded-bullseye
index f011fa0..b78e9d7 100644
--- a/Dockerfile-threaded-bullseye
+++ b/Dockerfile-threaded-bullseye
@@ -2,7 +2,7 @@
 # 
 # base layer with perl and some general preparations
 #
-FROM perl:5.36.3-slim-threaded-bullseye as base
+FROM perl:5.36.3-slim-threaded-bullseye AS base
 
 ARG TARGETPLATFORM
 
@@ -46,7 +46,7 @@ EOF
 # Install all CPAN Modules, needed from FHEM and standard modules
 #
 
-FROM perl:5.36.3-threaded-bullseye as build-cpan 
+FROM perl:5.36.3-threaded-bullseye AS build-cpan 
 
 COPY cpanfile /usr/src/app/core/cpanfile
 
@@ -55,6 +55,8 @@ RUN <<EOF
   LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update 
   LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \
       libusb-dev \
+      graphviz \
+      libgd-dev \
       python3-dev  
   LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean 
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*
@@ -71,8 +73,8 @@ RUN <<EOF
   if [ "${TARGETPLATFORM}" != "linux/amd64" ] && [ "${TARGETPLATFORM}" != "linux/i386" ]; then 
     sed -i '/Device::Firmata::Constants/d' /usr/src/app/core/cpanfile  
   fi
-  
   cpm install --without-test --with-suggests --with-recommends --cpanfile /usr/src/app/core/cpanfile --show-build-log-on-failure --configure-timeout=360 --workers=$(nproc) --local-lib-contained core/
+  
   rm -rf /root/.cpanm 
   rm -rf /root/.perl-cpm/
   rm -rf /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*
@@ -108,7 +110,7 @@ RUN <<EOF
 EOF
 
 
-FROM base as base-cpan 
+FROM base AS base-cpan 
 
 RUN <<EOF
     LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update 
@@ -153,7 +155,7 @@ COPY --from=build-cpan /usr/src/app/core/lib/perl5 /usr/src/app/core/lib/perl5
 #
 # Standard FHEM Layer
 #
-FROM base-cpan as with-fhem
+FROM base-cpan AS with-fhem
 
 ENV PERL5LIB=/usr/src/app/core/lib/perl5
 
@@ -203,13 +205,13 @@ ARG L_DESCR_FHEM="FHEM (TM) is a GPL'd perl server for house automation. It is u
 
 
 # non-standard labels
-LABEL org.fhem.authors ${L_AUTHORS_FHEM} \
-   org.fhem.url ${L_URL_FHEM} \
-   org.fhem.documentation ${L_USAGE_FHEM} \
-   org.fhem.source ${L_VCS_URL_FHEM} \
-   org.fhem.vendor ${L_VENDOR_FHEM} \
-   org.fhem.licenses ${L_LICENSES_FHEM} \
-   org.fhem.description ${L_DESCR_FHEM}
+LABEL org.fhem.authors=${L_AUTHORS_FHEM}
+LABEL org.fhem.url=${L_URL_FHEM}
+LABEL org.fhem.documentation=${L_USAGE_FHEM}
+LABEL org.fhem.source=${L_VCS_URL_FHEM}
+LABEL org.fhem.vendor=${L_VENDOR_FHEM}
+LABEL org.fhem.licenses=${L_LICENSES_FHEM}
+LABEL org.fhem.description=${L_DESCR_FHEM}
 
 # annotation labels according to
 # https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md#pre-defined-annotation-keys
@@ -299,7 +301,7 @@ EOF
 #
 # Add nodejs app layer
 #
-FROM with-fhem-extended-python as with-fhem-extended-python-nodejs
+FROM with-fhem-extended-python AS with-fhem-extended-python-nodejs
 
 ARG IMAGE_LAYER_NODEJS_EXT="0"
 
@@ -328,7 +330,7 @@ EOF
 # Layer only for bash unit testing
 #
 #
-FROM with-fhem as with-fhem-bats
+FROM with-fhem AS with-fhem-bats
 
 ADD https://github.com/bats-core/bats-core.git#v1.10.0 /tmp/bats
 RUN <<EOF
@@ -352,7 +354,7 @@ ENTRYPOINT [ "/usr/local/bin/bats" ]
 # Layer for bash integration testing
 #
 #
-FROM with-fhem-extended-python-nodejs as with-fhem-bats-extended-python-nodejs
+FROM with-fhem-extended-python-nodejs AS with-fhem-bats-extended-python-nodejs
 
 COPY --from=with-fhem-bats /opt/bats /opt/bats/
 RUN ln -s /opt/bats/bin/bats /usr/local/bin/bats 
diff --git a/scripts/excluded_packages.txt b/scripts/excluded_packages.txt
index 95e74e9..dfabdeb 100644
--- a/scripts/excluded_packages.txt
+++ b/scripts/excluded_packages.txt
@@ -48,7 +48,6 @@ ZWLib$
 UpNp:Common
 HttpUtils$
 Unit$
-GD$
 DevIo$
 AttrTemplate$
 ProtoThreads$

From 16c005f66a82823ce71bf1243015a21aa5811736 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Thu, 18 Jul 2024 23:22:52 +0200
Subject: [PATCH 2/4] fix[build]: fix condition for login action

---
 .github/workflows/prepare-docker/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/prepare-docker/action.yml b/.github/workflows/prepare-docker/action.yml
index 18537f2..0cba87f 100644
--- a/.github/workflows/prepare-docker/action.yml
+++ b/.github/workflows/prepare-docker/action.yml
@@ -38,14 +38,14 @@ runs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to DockerHub
-      if: github.event_name != 'pull_request' && inputs.DOCKER_HUB_USERNAME != null && inputs.DOCKER_HUB_ACCESS_TOKEN != null 
+      if: (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'publishImage') ) && inputs.DOCKER_HUB_USERNAME != null && inputs.DOCKER_HUB_ACCESS_TOKEN != null 
       uses: docker/login-action@v3
       with:
         username: ${{ inputs.DOCKER_HUB_USERNAME }}
         password: ${{ inputs.DOCKER_HUB_ACCESS_TOKEN }}
 
     - name: Login to GitHub Container Registry
-      if: github.event_name != 'pull_request' && inputs.GHCR_OWNER != null && inputs.GHCR_ACCESS_TOKEN != null
+      if:  (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'publishImage') ) && inputs.GHCR_OWNER != null && inputs.GHCR_ACCESS_TOKEN != null
       uses: docker/login-action@v3 
       with:
         registry: ghcr.io

From 3d13ac3f48346d94f3b29976dbd6ce02aec98aff Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:48:55 +0200
Subject: [PATCH 3/4] fix[build]: install libgd3 Fixes #258

---
 Dockerfile-bullseye          | 1 +
 Dockerfile-threaded-bullseye | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Dockerfile-bullseye b/Dockerfile-bullseye
index 6836419..d2b0804 100644
--- a/Dockerfile-bullseye
+++ b/Dockerfile-bullseye
@@ -146,6 +146,7 @@ RUN <<EOF
         wget \
         libarchive-dev \
         bash \
+        libgd3 \
         iproute2 
     LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean 
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*
diff --git a/Dockerfile-threaded-bullseye b/Dockerfile-threaded-bullseye
index b78e9d7..c073095 100644
--- a/Dockerfile-threaded-bullseye
+++ b/Dockerfile-threaded-bullseye
@@ -145,6 +145,7 @@ RUN <<EOF
         wget \
         libarchive-dev \
         bash \
+        libgd3 \
         iproute2 
     LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean 
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*

From 8d156affa11d6001a6746e68385ad4eb56859317 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:25:17 +0200
Subject: [PATCH 4/4] fix{build]: Added librsvg2-2 package

---
 Dockerfile-bullseye          | 1 +
 Dockerfile-threaded-bullseye | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Dockerfile-bullseye b/Dockerfile-bullseye
index d2b0804..4a8c730 100644
--- a/Dockerfile-bullseye
+++ b/Dockerfile-bullseye
@@ -147,6 +147,7 @@ RUN <<EOF
         libarchive-dev \
         bash \
         libgd3 \
+        librsvg2-2 \
         iproute2 
     LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean 
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*
diff --git a/Dockerfile-threaded-bullseye b/Dockerfile-threaded-bullseye
index c073095..5a7f1b7 100644
--- a/Dockerfile-threaded-bullseye
+++ b/Dockerfile-threaded-bullseye
@@ -146,6 +146,7 @@ RUN <<EOF
         libarchive-dev \
         bash \
         libgd3 \
+        librsvg2-2 \
         iproute2 
     LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean 
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*