Skip to content

Commit

Permalink
Fix Jessie source list
Browse files Browse the repository at this point in the history
  • Loading branch information
cytopia committed Mar 19, 2022
1 parent 672b850 commit 8865e97
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 6 deletions.
10 changes: 8 additions & 2 deletions Dockerfiles/Dockerfile.jessie
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ RUN set -eux \
# Remove Dependencies
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS} \
${BUILD_TOOLS_32} \
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS_32}; \
fi \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -167,7 +170,10 @@ RUN set -eux \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${PHP_BUILD_DEPS} \
${BUILD_TOOLS} \
${BUILD_TOOLS_32} \
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS_32}; \
fi \
# Install Run-time requirements
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
Expand Down
38 changes: 36 additions & 2 deletions Dockerfiles/Dockerfile.jessie-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,34 @@ ENV RUNTIME_TOOLS \
ca-certificates \
curl

RUN set -eux \
&& rm -f /etc/apt/sources.list.d/backports.list \
&& { \
echo "#deb http://deb.debian.org/debian jessie main"; \
echo "#deb http://security.debian.org/debian-security jessie/updates main"; \
echo "#deb http://deb.debian.org/debian jessie-updates main"; \
\
echo "deb [trusted=yes] http://archive.debian.org/debian jessie main"; \
echo "deb [trusted=yes] http://archive.debian.org/debian jessie-backports main"; \
echo "deb [trusted=yes] http://archive.debian.org/debian jessie-backports-sloppy main"; \
} > /etc/apt/sources.list \
# Ignore gpg checks
&& { \
echo 'APT { Get { AllowUnauthenticated "1"; }; };'; \
echo 'APT::Get::AllowUnauthenticated "true";'; \
} > /etc/apt/apt.conf.d/99allow_unauth \
# Ignore invalid repositories (EOL)
&& { \
echo 'Acquire::Check-Valid-Until "0";'; \
} > /etc/apt/apt.conf.d/10no--check-valid-until \
&& apt-key update \
# Fix: W: GPG error: http://archive.debian.org jessie Release: The following signatures were invalid: KEYEXPIRED 1587841717
&& apt-key list \
| grep "expired" \
| awk '{print $2}' \
| awk -F'/' '{print $2}' \
| xargs -n1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys


###
### Build OpenSSL
Expand Down Expand Up @@ -92,7 +120,10 @@ RUN set -eux \
# Remove Dependencies
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS} \
${BUILD_TOOLS_32} \
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS_32}; \
fi \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -167,7 +198,10 @@ RUN set -eux \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${PHP_BUILD_DEPS} \
${BUILD_TOOLS} \
${BUILD_TOOLS_32} \
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS_32}; \
fi \
# Install Run-time requirements
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
Expand Down
10 changes: 8 additions & 2 deletions Dockerfiles/Dockerfile.stretch
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ RUN set -eux \
# Remove Dependencies
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS} \
${BUILD_TOOLS_32} \
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS_32}; \
fi \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -170,7 +173,10 @@ RUN set -eux \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${PHP_BUILD_DEPS} \
${BUILD_TOOLS} \
${BUILD_TOOLS_32} \
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
${BUILD_TOOLS_32}; \
fi \
# Install Run-time requirements
&& apt-get update \
&& apt-get install -y --no-install-recommends --no-install-suggests \
Expand Down

0 comments on commit 8865e97

Please sign in to comment.