Merge pull request #2807 from alexbelgium/claude/immich-addons-v3-1cgj5x

Immich: fix build failure by dropping the redundant postgresql-client install

immich/Dockerfile

@@ -91,16 +91,12 @@ RUN if [ -f /etc/s6-overlay/s6-rc.d/init-test-run/run ]; then \
         sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run; \
     fi
 
-# Install dependencies (postgresql-client for psql CLI used in 99-run.sh)
+# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# imagegenius base image, so no separate install is needed here. A previous PGDG-repo
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# install using `apt-key add` was removed: the base image moved to a release where the
-    lsb-release \
+# apt-key binary no longer exists, breaking the build. Fail the build early, rather than
-    wget \
+# surfacing a cryptic runtime failure in 99-run.sh, if a future base image drops it.
-    gnupg && \
+RUN command -v psql || { echo "psql not found in base image; postgresql-client must be provided by the upstream base image" >&2; exit 1; }
-    echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends postgresql-client-15
 
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/ha_entrypoint.sh" ]

immich_cuda/Dockerfile

@@ -91,16 +91,12 @@ RUN if [ -f /etc/s6-overlay/s6-rc.d/init-test-run/run ]; then \
         sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run; \
     fi
 
-# Install dependencies (postgresql-client for psql CLI used in 99-run.sh)
+# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# imagegenius base image, so no separate install is needed here. A previous PGDG-repo
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# install using `apt-key add` was removed: the base image moved to a release where the
-    lsb-release \
+# apt-key binary no longer exists, breaking the build. Fail the build early, rather than
-    wget \
+# surfacing a cryptic runtime failure in 99-run.sh, if a future base image drops it.
-    gnupg && \
+RUN command -v psql || { echo "psql not found in base image; postgresql-client must be provided by the upstream base image" >&2; exit 1; }
-    echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends postgresql-client-15
 
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/ha_entrypoint.sh" ]

immich_noml/Dockerfile

@@ -91,16 +91,12 @@ RUN if [ -f /etc/s6-overlay/s6-rc.d/init-test-run/run ]; then \
         sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run; \
     fi
 
-# Install dependencies (postgresql-client for psql CLI used in 99-run.sh)
+# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# imagegenius base image, so no separate install is needed here. A previous PGDG-repo
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# install using `apt-key add` was removed: the base image moved to a release where the
-    lsb-release \
+# apt-key binary no longer exists, breaking the build. Fail the build early, rather than
-    wget \
+# surfacing a cryptic runtime failure in 99-run.sh, if a future base image drops it.
-    gnupg && \
+RUN command -v psql || { echo "psql not found in base image; postgresql-client must be provided by the upstream base image" >&2; exit 1; }
-    echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends postgresql-client-15
 
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/ha_entrypoint.sh" ]

immich_openvino/Dockerfile

@@ -91,16 +91,12 @@ RUN if [ -f /etc/s6-overlay/s6-rc.d/init-test-run/run ]; then \
         sed -i "s|postgresql-16|postgresql-15|g" /etc/s6-overlay/s6-rc.d/init-test-run/run; \
     fi
 
-# Install dependencies (postgresql-client for psql CLI used in 99-run.sh)
+# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# imagegenius base image, so no separate install is needed here. A previous PGDG-repo
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# install using `apt-key add` was removed: the base image moved to a release where the
-    lsb-release \
+# apt-key binary no longer exists, breaking the build. Fail the build early, rather than
-    wget \
+# surfacing a cryptic runtime failure in 99-run.sh, if a future base image drops it.
-    gnupg && \
+RUN command -v psql || { echo "psql not found in base image; postgresql-client must be provided by the upstream base image" >&2; exit 1; }
-    echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends postgresql-client-15
 
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/ha_entrypoint.sh" ]