Skip to content

Commit 09d9d7f

Browse files
committed
cleanup
1 parent c515caf commit 09d9d7f

2 files changed

Lines changed: 2 additions & 74 deletions

File tree

debian.apache.Dockerfile

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN \
3030
enchant \
3131
exif \
3232
ffi \
33-
# gd \
33+
gd \
3434
gettext \
3535
gmp \
3636
imagick \
@@ -55,41 +55,5 @@ RUN \
5555
zip \
5656
" \
5757
; \
58-
\
59-
ARCH=`uname -m` ; \
60-
echo "ARCH=$ARCH" ; \
61-
if [[ "$ARCH" == "armv"* ]]; then \
62-
# fix: /usr/lib/gcc/arm-linux-gnueabihf/10/include/arm_neon.h:10403:1: error: inlining failed in call to ‘always_inline’ ‘vld1q_u8’: target specific option mismatch
63-
apt-get update ; \
64-
apt-get install -y --no-install-recommends libfreetype6 libjpeg62-turbo ^libpng[0-9]+-[0-9]+$ libxpm4 ^libwebp[0-9]+$ ; \
65-
temp_package="libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev" ; \
66-
apt-get install -y --no-install-recommends $temp_package ; \
67-
docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype ; \
68-
docker-php-ext-install -j$(nproc) gd ; \
69-
apt-get purge -y $temp_package ; apt-get autoremove -y ; \
70-
rm -rf /var/lib/apt/lists/* ; \
71-
#php -i | grep 'GD' ; \
72-
else \
73-
PHP_EXTENSIONS_LIST="$PHP_EXTENSIONS_LIST gd imap" ; \
74-
fi ; \
75-
# bugfix/workarround: https://packages.debian.org/search?suite=default&section=all&arch=any&searchon=names&keywords=libmemcachedutil2
76-
DISTRO="$(cat /etc/os-release | grep -E ^ID= | cut -d = -f 2)" ; \
77-
DISTRO_VERSION_NUMBER="$(cat /etc/os-release | grep -E ^VERSION_ID= | cut -d = -f 2 | cut -d '"' -f 2 | cut -d . -f 1,2)" ; \
78-
if [ "$DISTRO" = "debian" ] && [ "$DISTRO_VERSION_NUMBER" -ge 13 ]; then \
79-
if grep -q 'libmemcachedutil2' /usr/local/bin/install-php-extensions && \
80-
! grep -q 'libmemcachedutil2t64' /usr/local/bin/install-php-extensions; then \
81-
echo ">> Applying libmemcachedutil2 → libmemcachedutil2t64 workaround"; \
82-
sed -i 's/libmemcachedutil2/libmemcachedutil2t64/g' /usr/local/bin/install-php-extensions; \
83-
else \
84-
echo ">> libmemcachedutil2 Workaround not needed (already fixed upstream)"; \
85-
fi; \
86-
if grep -q 'libssl3' /usr/local/bin/install-php-extensions && \
87-
! grep -q 'libssl3t64' /usr/local/bin/install-php-extensions; then \
88-
echo ">> Applying libssl3 → libssl3t64 workaround"; \
89-
sed -i 's/libssl3/libssl3t64/g' /usr/local/bin/install-php-extensions; \
90-
else \
91-
echo ">> libssl3 Workaround not needed (already fixed upstream)"; \
92-
fi; \
93-
fi; \
9458
install-php-extensions $PHP_EXTENSIONS_LIST ; \
9559
php -m

debian.fpm.Dockerfile

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN \
3030
enchant \
3131
exif \
3232
ffi \
33-
# gd \
33+
gd \
3434
gettext \
3535
gmp \
3636
imagick \
@@ -55,41 +55,5 @@ RUN \
5555
zip \
5656
" \
5757
; \
58-
\
59-
ARCH=`uname -m` ; \
60-
echo "ARCH=$ARCH" ; \
61-
if [[ "$ARCH" == "armv"* ]]; then \
62-
# fix: /usr/lib/gcc/arm-linux-gnueabihf/10/include/arm_neon.h:10403:1: error: inlining failed in call to ‘always_inline’ ‘vld1q_u8’: target specific option mismatch
63-
apt-get update ; \
64-
apt-get install -y --no-install-recommends libfreetype6 libjpeg62-turbo ^libpng[0-9]+-[0-9]+$ libxpm4 ^libwebp[0-9]+$ ; \
65-
temp_package="libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev" ; \
66-
apt-get install -y --no-install-recommends $temp_package ; \
67-
docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype ; \
68-
docker-php-ext-install -j$(nproc) gd ; \
69-
apt-get purge -y $temp_package ; apt-get autoremove -y ; \
70-
rm -rf /var/lib/apt/lists/* ; \
71-
#php -i | grep 'GD' ; \
72-
else \
73-
PHP_EXTENSIONS_LIST="$PHP_EXTENSIONS_LIST gd imap" ; \
74-
fi ; \
75-
# bugfix/workarround: https://packages.debian.org/search?suite=default&section=all&arch=any&searchon=names&keywords=libmemcachedutil2
76-
DISTRO="$(cat /etc/os-release | grep -E ^ID= | cut -d = -f 2)" ; \
77-
DISTRO_VERSION_NUMBER="$(cat /etc/os-release | grep -E ^VERSION_ID= | cut -d = -f 2 | cut -d '"' -f 2 | cut -d . -f 1,2)" ; \
78-
if [ "$DISTRO" = "debian" ] && [ "$DISTRO_VERSION_NUMBER" -ge 13 ]; then \
79-
if grep -q 'libmemcachedutil2' /usr/local/bin/install-php-extensions && \
80-
! grep -q 'libmemcachedutil2t64' /usr/local/bin/install-php-extensions; then \
81-
echo ">> Applying libmemcachedutil2 → libmemcachedutil2t64 workaround"; \
82-
sed -i 's/libmemcachedutil2/libmemcachedutil2t64/g' /usr/local/bin/install-php-extensions; \
83-
else \
84-
echo ">> libmemcachedutil2 Workaround not needed (already fixed upstream)"; \
85-
fi; \
86-
if grep -q 'libssl3' /usr/local/bin/install-php-extensions && \
87-
! grep -q 'libssl3t64' /usr/local/bin/install-php-extensions; then \
88-
echo ">> Applying libssl3 → libssl3t64 workaround"; \
89-
sed -i 's/libssl3/libssl3t64/g' /usr/local/bin/install-php-extensions; \
90-
else \
91-
echo ">> libssl3 Workaround not needed (already fixed upstream)"; \
92-
fi; \
93-
fi; \
9458
install-php-extensions $PHP_EXTENSIONS_LIST ; \
9559
php -m

0 commit comments

Comments
 (0)