Skip to content

Commit 6616f33

Browse files
cytopiacytopia
authored
Merge pull request #183 from devilbox/release-0.118
Release 0.118
2 parents 62c65d1 + 30f18d8 commit 6616f33

File tree

14 files changed

+120
-34
lines changed

14 files changed

+120
-34
lines changed

‎.github/workflows/linting.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
job: [gen-dockerfiles]
1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v1
21+
uses: actions/checkout@v2
2222
- name: Diff generated Docker files
2323
run: |
2424
make "${JOB}"

‎.github/workflows/php-ci.yml

+26-13
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: False
3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v1
35+
uses: actions/checkout@v2
3636

3737
- name: Show environment
3838
run: |
@@ -87,22 +87,35 @@ jobs:
8787
# ------------------------------------------------------------
8888
- name: Checkout repository
8989
uses: actions/checkout@v2
90+
with:
91+
fetch-depth: 0
9092

9193
- name: Set variables
9294
id: vars
9395
run: |
94-
# Set git branch or git tag as slug
95-
if [[ ${GITHUB_REF} =~ ^refs\/tags\/ ]]; then
96-
GIT_TYPE=TAG
97-
GIT_SLUG="${GITHUB_REF/refs\/tags\//}"
98-
else
99-
GIT_TYPE=BRANCH
100-
if [ -n "${GITHUB_HEAD_REF}" ]; then
101-
GIT_SLUG="${GITHUB_HEAD_REF}"
102-
else
103-
GIT_SLUG="${GITHUB_REF/refs\/heads\//}"
104-
fi
105-
fi
96+
97+
# Retrieve git info (tags, etc)
98+
git fetch --all
99+
100+
# BRANCH, TAG or COMMIT
101+
GIT_TYPE="$( \
102+
curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
103+
| sh \
104+
| grep '^GIT_TYPE' \
105+
| sed 's|.*=||g' \
106+
)"
107+
# Branch name, Tag name or Commit Hash
108+
GIT_SLUG="$( \
109+
curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
110+
| sh \
111+
| grep '^GIT_NAME' \
112+
| sed 's|.*=||g' \
113+
)"
114+
115+
# Output
116+
echo "GIT_TYPE=${GIT_TYPE}"
117+
echo "GIT_SLUG=${GIT_SLUG}"
118+
106119
# Export variable
107120
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
108121
echo "GIT_TYPE=${GIT_TYPE}" >> $GITHUB_ENV

‎.github/workflows/php-nightly.yml

+25-12
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: False
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v1
29+
uses: actions/checkout@v2
3030

3131
- name: Show environment
3232
run: |
@@ -82,7 +82,7 @@ jobs:
8282
- '8.1'
8383
refs:
8484
- 'master'
85-
- '0.114'
85+
- '0.118'
8686
steps:
8787

8888
# ------------------------------------------------------------
@@ -97,16 +97,29 @@ jobs:
9797
- name: Set variables
9898
id: vars
9999
run: |
100-
# Set git branch or git tag as slug
101-
if [ -n "$( git tag --points-at HEAD )" ]; then
102-
GIT_TYPE=TAG
103-
GIT_SLUG="$( git tag --points-at HEAD )"
104-
elif [ "$( git rev-parse --abbrev-ref HEAD )" != "HEAD" ]; then
105-
GIT_TYPE=BRANCH
106-
GIT_SLUG="$( git rev-parse --abbrev-ref HEAD )"
107-
else
108-
false
109-
fi
100+
101+
# Retrieve git info (tags, etc)
102+
git fetch --all
103+
104+
# BRANCH, TAG or COMMIT
105+
GIT_TYPE="$( \
106+
curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
107+
| sh \
108+
| grep '^GIT_TYPE' \
109+
| sed 's|.*=||g' \
110+
)"
111+
# Branch name, Tag name or Commit Hash
112+
GIT_SLUG="$( \
113+
curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
114+
| sh \
115+
| grep '^GIT_NAME' \
116+
| sed 's|.*=||g' \
117+
)"
118+
119+
# Output
120+
echo "GIT_TYPE=${GIT_TYPE}"
121+
echo "GIT_SLUG=${GIT_SLUG}"
122+
110123
# Export variable
111124
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
112125
echo "GIT_TYPE=${GIT_TYPE}" >> $GITHUB_ENV

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
## Unreleased
55

66

7+
## Release 0.118
8+
9+
#### Fixed
10+
- Fixed `mdl` rubygem
11+
12+
#### Added
13+
- [#182](https://github.com/devilbox/docker-php-fpm/issues/182) Added `ioncube` to PHP 7.4
14+
- Added `sqlsrv` to PHP 7.4
15+
16+
#### Changed
17+
- Updated xdebug to latest possible version
18+
19+
720
## Release 0.117
821

922
#### Fixed

‎Dockerfiles/mods/Dockerfile-7.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -716,10 +716,10 @@ RUN set -eux \
716716

717717
# -------------------- Installing PHP Extension: xdebug --------------------
718718
RUN set -eux \
719-
# Installation: Generic
719+
# Installation: Version specific
720720
# Type: PECL extension
721721
# Default: Pecl command
722-
&& pecl install xdebug \
722+
&& pecl install xdebug-2.9.8 \
723723
# Enabling
724724
&& docker-php-ext-enable xdebug \
725725
&& true

‎Dockerfiles/mods/Dockerfile-7.4

+32
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ RUN set -eux \
6868
libyaml-dev \
6969
libzip-dev \
7070
snmp \
71+
unixodbc-dev \
7172
zlib1g-dev \
7273
ca-certificates \
7374
git
@@ -87,6 +88,23 @@ RUN set -eux \
8788
echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
8889
fi
8990

91+
# -------------------- Installing PHP Extension: ioncube --------------------
92+
RUN set -eux \
93+
# Installation: Generic
94+
# Type: Custom extension
95+
&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
96+
&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
97+
&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \
98+
&& tar xvfz ioncube.tar.gz \
99+
&& cd ioncube \
100+
&& cp "ioncube_loader_lin_7.4.so" "${EXTENSION_DIR}/ioncube.so" \
101+
&& cd ../ \
102+
&& rm -rf ioncube \
103+
&& rm -rf ioncube.tar.gz \
104+
\
105+
&& true
106+
107+
90108
# -------------------- Installing PHP Extension: amqp --------------------
91109
RUN set -eux \
92110
# Installation: Generic
@@ -581,6 +599,17 @@ RUN set -eux \
581599
&& true
582600

583601

602+
# -------------------- Installing PHP Extension: sqlsrv --------------------
603+
RUN set -eux \
604+
# Installation: Generic
605+
# Type: PECL extension
606+
# Default: Pecl command
607+
&& pecl install sqlsrv \
608+
# Enabling
609+
&& docker-php-ext-enable sqlsrv \
610+
&& true
611+
612+
584613
# -------------------- Installing PHP Extension: ssh2 --------------------
585614
RUN set -eux \
586615
# Installation: Generic
@@ -839,6 +868,7 @@ RUN set -eux \
839868
libyaml-0-2 \
840869
libzip4 \
841870
snmp \
871+
unixodbc \
842872
ca-certificates \
843873
&& rm -rf /var/lib/apt/lists/* \
844874
\
@@ -1021,6 +1051,8 @@ RUN set -eux \
10211051
&& php-fpm -m | grep -oiE '^solr$' \
10221052
&& php -m | grep -oiE '^spl$' \
10231053
&& php-fpm -m | grep -oiE '^spl$' \
1054+
&& php -m | grep -oiE '^sqlsrv$' \
1055+
&& php-fpm -m | grep -oiE '^sqlsrv$' \
10241056
&& php -m | grep -oiE '^ssh2$' \
10251057
&& php-fpm -m | grep -oiE '^ssh2$' \
10261058
&& php -m | grep -oiE '^swoole$' \

‎Dockerfiles/mods/Dockerfile-8.0

+2
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,8 @@ RUN set -eux \
437437
# Type: GIT extension
438438
&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
439439
&& cd /tmp/xdebug \
440+
# Custom: Branch
441+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
440442
# Default: Install command
441443
&& phpize \
442444
&& ./configure --enable-xdebug \

‎Dockerfiles/mods/Dockerfile-8.1

+2
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,8 @@ RUN set -eux \
437437
# Type: GIT extension
438438
&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
439439
&& cd /tmp/xdebug \
440+
# Custom: Branch
441+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
440442
# Default: Install command
441443
&& phpize \
442444
&& ./configure --enable-xdebug \

‎Dockerfiles/work/Dockerfile-7.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ RUN set -eux \
495495
&& gem install rb-inotify -v 0.9.10 \
496496
\
497497
# -------------------- mdl --------------------
498-
&& gem install mdl \
498+
&& gem install mdl -v 0.5.0 \
499499
\
500500
\
501501
&& rm -rf /root/.gem \

‎Dockerfiles/work/Dockerfile-7.2

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ RUN set -eux \
496496
&& gem install rb-inotify -v 0.9.10 \
497497
\
498498
# -------------------- mdl --------------------
499-
&& gem install mdl \
499+
&& gem install mdl -v 0.5.0 \
500500
\
501501
\
502502
&& rm -rf /root/.gem \

‎Dockerfiles/work/Dockerfile-7.3

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ RUN set -eux \
496496
&& gem install rb-inotify -v 0.9.10 \
497497
\
498498
# -------------------- mdl --------------------
499-
&& gem install mdl \
499+
&& gem install mdl -v 0.5.0 \
500500
\
501501
\
502502
&& rm -rf /root/.gem \

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ Check out this table to see which Docker image provides what PHP modules.
676676
<tr>
677677
<th>7.4</th>
678678
<td id="74-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
679-
<td id="74-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, vips, xdebug, xlswriter, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
679+
<td id="74-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, vips, xdebug, xlswriter, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
680680
</tr>
681681
<tr>
682682
<th>8.0</th>

‎build/ansible/group_vars/all/mods.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ extensions_available:
413413
build_dep: [libicu-dev]
414414
run_dep: [libicu63]
415415
ioncube:
416-
disabled: [7.4, 8.0, 8.1]
416+
disabled: [8.0, 8.1]
417417
all:
418418
type: custom
419419
command: |
@@ -938,7 +938,7 @@ extensions_available:
938938
spl:
939939
already_avail: "{{ php_all_versions }}"
940940
sqlsrv:
941-
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0, 8.1]
941+
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0, 8.1]
942942
7.0:
943943
type: pecl
944944
version: 5.3.0
@@ -1153,13 +1153,18 @@ extensions_available:
11531153
7.0:
11541154
type: pecl
11551155
version: 2.9.0
1156+
7.1:
1157+
type: pecl
1158+
version: 2.9.8
11561159
8.0:
11571160
type: git
11581161
git_url: https://github.com/xdebug/xdebug
1162+
git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
11591163
configure: --enable-xdebug
11601164
8.1:
11611165
type: git
11621166
git_url: https://github.com/xdebug/xdebug
1167+
git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
11631168
configure: --enable-xdebug
11641169
all:
11651170
type: pecl

‎build/ansible/group_vars/all/work.yml

+6
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,12 @@ gem_available:
277277
version: 0.5.0
278278
7.4:
279279
version: 0.5.0
280+
7.3:
281+
version: 0.5.0
282+
7.2:
283+
version: 0.5.0
284+
7.1:
285+
version: 0.5.0
280286
7.0:
281287
version: 0.5.0
282288
5.6:

0 commit comments

Comments
 (0)