mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-09-02 20:43:35 +02:00
Immich: fix build failure by dropping the redundant postgresql-client install
The imagegenius v3 base image moved to a newer Ubuntu release where the apt-key binary no longer exists, breaking the Dockerfiles' manual PGDG-repo install of postgresql-client-15 (`wget ... | apt-key add -`). That install was already redundant: imagegenius's own Dockerfile installs postgresql-client-14 through 18 itself (via the modern signed-by keyring method), so the psql CLI used by 99-run.sh is already present in the base image. Remove the downstream install entirely rather than patching it to use a keyring, since it duplicated work the base image already does. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PcbbgB7A5LLbPuPRjLUouk
This commit is contained in:
@@ -91,16 +91,10 @@ 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)
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
lsb-release \
|
||||
wget \
|
||||
gnupg && \
|
||||
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
|
||||
# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
|
||||
# imagegenius base image (postgresql-client-14 through 18), so no separate install is
|
||||
# needed here. A previous PGDG-repo install using `apt-key add` was removed: the base
|
||||
# image moved to a release where the apt-key binary no longer exists, breaking the build.
|
||||
|
||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
||||
#CMD [ "/ha_entrypoint.sh" ]
|
||||
|
||||
@@ -91,16 +91,10 @@ 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)
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
lsb-release \
|
||||
wget \
|
||||
gnupg && \
|
||||
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
|
||||
# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
|
||||
# imagegenius base image (postgresql-client-14 through 18), so no separate install is
|
||||
# needed here. A previous PGDG-repo install using `apt-key add` was removed: the base
|
||||
# image moved to a release where the apt-key binary no longer exists, breaking the build.
|
||||
|
||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
||||
#CMD [ "/ha_entrypoint.sh" ]
|
||||
|
||||
@@ -91,16 +91,10 @@ 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)
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
lsb-release \
|
||||
wget \
|
||||
gnupg && \
|
||||
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
|
||||
# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
|
||||
# imagegenius base image (postgresql-client-14 through 18), so no separate install is
|
||||
# needed here. A previous PGDG-repo install using `apt-key add` was removed: the base
|
||||
# image moved to a release where the apt-key binary no longer exists, breaking the build.
|
||||
|
||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
||||
#CMD [ "/ha_entrypoint.sh" ]
|
||||
|
||||
@@ -91,16 +91,10 @@ 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)
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
lsb-release \
|
||||
wget \
|
||||
gnupg && \
|
||||
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
|
||||
# postgresql-client (for the psql CLI used in 99-run.sh) is already installed by the
|
||||
# imagegenius base image (postgresql-client-14 through 18), so no separate install is
|
||||
# needed here. A previous PGDG-repo install using `apt-key add` was removed: the base
|
||||
# image moved to a release where the apt-key binary no longer exists, breaking the build.
|
||||
|
||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
||||
#CMD [ "/ha_entrypoint.sh" ]
|
||||
|
||||
Reference in New Issue
Block a user