Skip to content

Commit

Permalink
Merge pull request #150 from wikimedia/fix-missing-sonames
Browse files Browse the repository at this point in the history 
Fix missing sonames
  • Loading branch information
@christian-heusel
christian-heusel authored Oct 10, 2024
2 parents c743827 + 02834de commit 4708aab
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 49 deletions.
10 changes: 3 additions & 7 deletions 1.39/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down
10 changes: 3 additions & 7 deletions 1.39/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down
10 changes: 3 additions & 7 deletions 1.41/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down
10 changes: 3 additions & 7 deletions 1.41/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down
10 changes: 3 additions & 7 deletions 1.42/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down
10 changes: 3 additions & 7 deletions 1.42/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down
10 changes: 3 additions & 7 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ RUN set -eux; \

# Install the PHP extensions we need
RUN set -eux; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
liblua5.1-0 \
; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
libicu-dev \
libonig-dev \
Expand All @@ -49,9 +45,9 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
| xargs -r dpkg-query -S \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
Expand Down

0 comments on commit 4708aab

Please sign in to comment.