Skip to content

Commit 436babd

Browse files
cytopiacytopia
authored
Merge pull request #231 from devilbox/release-0.136
Release 0.136
2 parents 4564470 + abfeef2 commit 436babd

37 files changed

Lines changed: 919 additions & 314 deletions

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- '8.2'
4242
refs:
4343
- 'master'
44-
- '0.135'
44+
- '0.136'
4545
steps:
4646

4747
# ------------------------------------------------------------

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44
## Unreleased
55

66

7+
## Release 0.136
8+
9+
#### Fixed
10+
- Fixed `mongodb-org-shell` and `mongodb-org-tools` install
11+
12+
#### Added
13+
- Re-added `mongodb` for PHP 5.3
14+
15+
#### Changed
16+
- Switch PHP 5.4 base image to [devilbox/php-fpm-5.4](https://github.com/devilbox/docker-php-fpm-5.4) for potential arm64 support
17+
- Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for potential arm64 support
18+
- Changed base image back to Debian Jessie for PHP 5.2 and PHP 5.3
19+
20+
721
## Release 0.135
822

923
#### Fixed

‎Dockerfiles/base/Dockerfile-5.4‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
2-
FROM php:5.4-fpm
2+
FROM devilbox/php-fpm-5.4
33
MAINTAINER "cytopia" <[email protected]>
44

55

@@ -43,13 +43,6 @@ RUN set -eux \
4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -eux \
47-
&& rm -f /etc/apt/sources.list \
48-
&& { \
49-
echo "deb http://ftp.debian.org/debian jessie main"; \
50-
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
51-
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
52-
} | tee /etc/apt/sources.list
5346
RUN set -eux \
5447
&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
5548
&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \

‎Dockerfiles/base/Dockerfile-5.5‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
2-
FROM php:5.5-fpm
2+
FROM devilbox/php-fpm-5.5
33
MAINTAINER "cytopia" <[email protected]>
44

55

@@ -43,13 +43,6 @@ RUN set -eux \
4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -eux \
47-
&& rm -f /etc/apt/sources.list \
48-
&& { \
49-
echo "deb http://ftp.debian.org/debian jessie main"; \
50-
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
51-
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
52-
} | tee /etc/apt/sources.list
5346
RUN set -eux \
5447
&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
5548
&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \

‎Dockerfiles/mods/Dockerfile-5.2‎

Lines changed: 76 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ RUN set -eux \
2626
libmagic-dev \
2727
libmcrypt-dev \
2828
libmemcached-dev \
29+
libmysqlclient-dev \
2930
libpcre3-dev \
3031
libpng-dev \
3132
libpq-dev \
3233
libpspell-dev \
3334
librabbitmq-dev \
34-
librecode-dev \
3535
libsasl2-dev \
3636
libsnmp-dev \
3737
libssl-dev \
@@ -43,8 +43,28 @@ RUN set -eux \
4343
libxslt-dev \
4444
snmp \
4545
zlib1g-dev \
46+
# Build tools
47+
autoconf \
48+
bison \
49+
bisonc++ \
4650
ca-certificates \
47-
git
51+
curl \
52+
dpkg-dev \
53+
file \
54+
flex \
55+
g++ \
56+
gcc \
57+
git \
58+
lemon \
59+
libc-client-dev \
60+
libc-dev \
61+
libcurl4-openssl-dev \
62+
libssl-dev \
63+
make \
64+
patch \
65+
pkg-config \
66+
re2c \
67+
xz-utils
4868

4969

5070
# Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -134,22 +154,14 @@ RUN set -eux \
134154
&& true
135155

136156

137-
# -------------------- Installing PHP Extension: ftp --------------------
138-
RUN set -eux \
139-
# Installation: Generic
140-
# Type: Built-in extension
141-
# Custom: configure command
142-
&& docker-php-ext-configure ftp --with-openssl-dir \
143-
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \
144-
&& true
145-
146-
147157
# -------------------- Installing PHP Extension: gd --------------------
148158
RUN set -eux \
149159
# Version specific pre-command
150160
&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \
151161
ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
152-
ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
162+
ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \
163+
mkdir /usr/include/freetype2/freetype && \
164+
ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
153165
\
154166
# Installation: Version specific
155167
# Type: Built-in extension
@@ -275,6 +287,25 @@ RUN set -eux \
275287
&& true
276288

277289

290+
# -------------------- Installing PHP Extension: mysql --------------------
291+
RUN set -eux \
292+
# Installation: Generic
293+
# Type: Built-in extension
294+
# Custom: configure command
295+
&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
296+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
297+
&& true
298+
299+
300+
# -------------------- Installing PHP Extension: mysqli --------------------
301+
RUN set -eux \
302+
# Installation: Version specific
303+
# Type: Built-in extension
304+
# Installation
305+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
306+
&& true
307+
308+
278309
# -------------------- Installing PHP Extension: oauth --------------------
279310
RUN set -eux \
280311
# Installation: Version specific
@@ -323,6 +354,17 @@ RUN set -eux \
323354
&& true
324355

325356

357+
# -------------------- Installing PHP Extension: pdo_mysql --------------------
358+
RUN set -eux \
359+
# Installation: Version specific
360+
# Type: Built-in extension
361+
# Default: configure command
362+
&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
363+
# Installation
364+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
365+
&& true
366+
367+
326368
# -------------------- Installing PHP Extension: pdo_pgsql --------------------
327369
RUN set -eux \
328370
# Installation: Generic
@@ -358,14 +400,6 @@ RUN set -eux \
358400
&& true
359401

360402

361-
# -------------------- Installing PHP Extension: recode --------------------
362-
RUN set -eux \
363-
# Installation: Generic
364-
# Type: Built-in extension
365-
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
366-
&& true
367-
368-
369403
# -------------------- Installing PHP Extension: redis --------------------
370404
RUN set -eux \
371405
# Installation: Version specific
@@ -395,6 +429,16 @@ RUN set -eux \
395429
&& true
396430

397431

432+
# -------------------- Installing PHP Extension: soap --------------------
433+
RUN set -eux \
434+
# Installation: Generic
435+
# Type: Built-in extension
436+
# Custom: configure command
437+
&& docker-php-ext-configure soap --with-libxml-dir=/usr \
438+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
439+
&& true
440+
441+
398442
# -------------------- Installing PHP Extension: sockets --------------------
399443
RUN set -eux \
400444
# Installation: Generic
@@ -560,22 +604,24 @@ RUN set -eux \
560604
libenchant1c2a \
561605
libfbclient2 \
562606
libfreetype6 \
563-
libicu57 \
607+
libicu52 \
564608
libjpeg62-turbo \
565-
libmariadbclient18 \
609+
libmagic1 \
566610
libmcrypt4 \
567611
libmemcachedutil2 \
568-
libpng16-16 \
612+
libmysqlclient18 \
613+
libpng12-0 \
569614
libpq5 \
570-
librabbitmq4 \
615+
librabbitmq1 \
571616
librecode0 \
572617
libsybdb5 \
573-
libtidy5 \
574-
libvpx4 \
575-
libwebp6 \
618+
libtidy-0.99-0 \
619+
libvpx1 \
620+
libwebp5 \
576621
libxpm4 \
577622
libxslt1.1 \
578623
snmp \
624+
zlib1g \
579625
ca-certificates \
580626
&& rm -rf /var/lib/apt/lists/* \
581627
\
@@ -662,6 +708,8 @@ RUN set -eux \
662708
&& php-fpm -m | grep -oiE '^memcache$' \
663709
&& php -m | grep -oiE '^memcached$' \
664710
&& php-fpm -m | grep -oiE '^memcached$' \
711+
&& php -m | grep -oiE '^mhash$' \
712+
&& php-fpm -m | grep -oiE '^mhash$' \
665713
&& php -m | grep -oiE '^mongo$' \
666714
&& php-fpm -m | grep -oiE '^mongo$' \
667715
&& php -m | grep -oiE '^mysql$' \

0 commit comments

Comments
 (0)