Skip to content

Commit 47e221e

Browse files
cytopiacytopia
authored
Merge pull request #108 from devilbox/release-0.82
Fix apt repositories for Debian Jessie
2 parents 4b40a0d + 173fd46 commit 47e221e

20 files changed

Lines changed: 93 additions & 69 deletions

‎Dockerfiles/base/Dockerfile-5.2‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ RUN set -x \
3535
###
3636
### Upgrade (install ps)
3737
###
38+
RUN set -x \
39+
&& rm -f /etc/apt/sources.list \
40+
&& { \
41+
echo "deb http://ftp.debian.org/debian jessie main"; \
42+
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
43+
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
44+
} | tee /etc/apt/sources.list
3845
RUN set -x \
3946
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4047
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \

‎Dockerfiles/base/Dockerfile-5.3‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ RUN set -x \
3535
###
3636
### Upgrade (install ps)
3737
###
38+
RUN set -x \
39+
&& rm -f /etc/apt/sources.list \
40+
&& { \
41+
echo "deb http://ftp.debian.org/debian jessie main"; \
42+
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
43+
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
44+
} | tee /etc/apt/sources.list
3845
RUN set -x \
3946
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4047
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \

‎Dockerfiles/base/Dockerfile-5.4‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ RUN set -x \
3535
###
3636
### Upgrade (install ps)
3737
###
38+
RUN set -x \
39+
&& rm -f /etc/apt/sources.list \
40+
&& { \
41+
echo "deb http://ftp.debian.org/debian jessie main"; \
42+
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
43+
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
44+
} | tee /etc/apt/sources.list
3845
RUN set -x \
3946
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4047
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \

‎Dockerfiles/base/Dockerfile-5.5‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ RUN set -x \
3535
###
3636
### Upgrade (install ps)
3737
###
38+
RUN set -x \
39+
&& rm -f /etc/apt/sources.list \
40+
&& { \
41+
echo "deb http://ftp.debian.org/debian jessie main"; \
42+
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
43+
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
44+
} | tee /etc/apt/sources.list
3845
RUN set -x \
3946
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4047
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \

‎Dockerfiles/mods/Dockerfile-8.0‎

Lines changed: 8 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -169,28 +169,17 @@ RUN set -x \
169169
&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
170170
&& cd /tmp/memcached \
171171
&& git checkout master \
172-
&& phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \
173-
&& docker-php-ext-enable memcached \
174-
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
175-
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
176-
\
177-
# ---- Installing PHP Extension: mongodb ----
178-
&& git clone https://github.com/mongodb/mongo-php-driver /tmp/mongodb \
179-
&& cd /tmp/mongodb \
180-
&& git submodule update --init \
172+
&& true \
173+
# FIXME: This is a work-around to mitigate compile error with PHP 8.0
174+
&& sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \
181175
&& phpize \
182-
&& ./configure --enable-mongodb \
183-
&& make all \
176+
&& ./configure --enable-memcached \
177+
&& make -j$(getconf _NPROCESSORS_ONLN) \
184178
&& make install \
185179
\
186-
&& docker-php-ext-enable mongodb \
187-
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
188-
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
189-
\
190-
# ---- Installing PHP Extension: mysqli ----
191-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
192-
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
193-
&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
180+
&& docker-php-ext-enable memcached \
181+
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
182+
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
194183
\
195184
# ---- Installing PHP Extension: oci8 ----
196185
&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
@@ -281,21 +270,6 @@ RUN set -x \
281270
&& (rm -rf /usr/local/lib/php/test/recode || true) \
282271
&& (rm -rf /usr/local/lib/php/doc/recode || true) \
283272
\
284-
# ---- Installing PHP Extension: redis ----
285-
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
286-
&& cd /tmp/redis \
287-
&& phpize \
288-
&& sed -i'' 's/ZEND_ACC_CTOR | //g' redis.c \
289-
&& sed -i'' 's/ZEND_ACC_DTOR | //g' redis.c \
290-
&& sed -i'' 's/ZEND_ACC_CTOR | //g' redis_cluster.c \
291-
&& ./configure \
292-
&& make -j$(getconf _NPROCESSORS_ONLN) \
293-
&& make install \
294-
\
295-
&& docker-php-ext-enable redis \
296-
&& (rm -rf /usr/local/lib/php/test/redis || true) \
297-
&& (rm -rf /usr/local/lib/php/doc/redis || true) \
298-
\
299273
# ---- Installing PHP Extension: shmop ----
300274
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
301275
&& (rm -rf /usr/local/lib/php/test/shmop || true) \
@@ -343,17 +317,6 @@ RUN set -x \
343317
&& (rm -rf /usr/local/lib/php/test/tidy || true) \
344318
&& (rm -rf /usr/local/lib/php/doc/tidy || true) \
345319
\
346-
# ---- Installing PHP Extension: uploadprogress ----
347-
&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
348-
&& cd /tmp/uploadprogress \
349-
&& phpize \
350-
&& ./configure --enable-uploadprogress \
351-
&& make -j$(getconf _NPROCESSORS_ONLN) \
352-
&& make install \
353-
&& docker-php-ext-enable uploadprogress \
354-
&& (rm -rf /usr/local/lib/php/test/uploadprogress || true) \
355-
&& (rm -rf /usr/local/lib/php/doc/uploadprogress || true) \
356-
\
357320
# ---- Installing PHP Extension: xmlrpc ----
358321
&& /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \
359322
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
@@ -459,10 +422,6 @@ RUN set -x \
459422
&& php-fpm -m | grep -oiE '^mbstring$' \
460423
&& php -m | grep -oiE '^memcached$' \
461424
&& php-fpm -m | grep -oiE '^memcached$' \
462-
&& php -m | grep -oiE '^mongodb$' \
463-
&& php-fpm -m | grep -oiE '^mongodb$' \
464-
&& php -m | grep -oiE '^mysqli$' \
465-
&& php-fpm -m | grep -oiE '^mysqli$' \
466425
&& php -m | grep -oiE '^mysqlnd$' \
467426
&& php-fpm -m | grep -oiE '^mysqlnd$' \
468427
&& php -m | grep -oiE '^oci8$' \
@@ -500,8 +459,6 @@ RUN set -x \
500459
&& php -m | grep -oiE '^readline$' \
501460
&& php -m | grep -oiE '^recode$' \
502461
&& php-fpm -m | grep -oiE '^recode$' \
503-
&& php -m | grep -oiE '^redis$' \
504-
&& php-fpm -m | grep -oiE '^redis$' \
505462
&& php -m | grep -oiE '^reflection$' \
506463
&& php-fpm -m | grep -oiE '^reflection$' \
507464
&& php -m | grep -oiE '^session$' \
@@ -530,8 +487,6 @@ RUN set -x \
530487
&& php-fpm -m | grep -oiE '^tidy$' \
531488
&& php -m | grep -oiE '^tokenizer$' \
532489
&& php-fpm -m | grep -oiE '^tokenizer$' \
533-
&& php -m | grep -oiE '^uploadprogress$' \
534-
&& php-fpm -m | grep -oiE '^uploadprogress$' \
535490
&& php -m | grep -oiE '^xml$' \
536491
&& php-fpm -m | grep -oiE '^xml$' \
537492
&& php -m | grep -oiE '^xmlreader$' \

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ RUN set -x \
3030
curl \
3131
dirmngr \
3232
gnupg \
33-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33+
&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
34+
&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
3435
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3536
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3637
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ RUN set -x \
3030
curl \
3131
dirmngr \
3232
gnupg \
33-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33+
&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
34+
&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
3435
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3536
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3637
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \

‎Dockerfiles/work/Dockerfile-5.4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ RUN set -x \
3030
curl \
3131
dirmngr \
3232
gnupg \
33-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33+
&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
34+
&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
3435
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3536
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3637
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \

‎Dockerfiles/work/Dockerfile-5.5‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ RUN set -x \
3030
curl \
3131
dirmngr \
3232
gnupg \
33-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33+
&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
34+
&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
3435
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3536
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3637
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \

‎Dockerfiles/work/Dockerfile-5.6‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN set -x \
3030
curl \
3131
dirmngr \
3232
gnupg \
33-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33+
&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
3434
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3535
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3636
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \

0 commit comments

Comments
 (0)