Merge pull request #183 from devilbox/release-0.118

Release 0.118
2025-12-11 11:31:16 +00:00 · 2020-11-30 10:56:31 +01:00
parent 62c65d19e7 30f18d858e
commit 6616f336cf
14 changed files with 120 additions and 34 deletions
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -18,7 +18,7 @@ jobs:
        job: [gen-dockerfiles]
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
      - name: Diff generated Docker files
        run: |
          make "${JOB}"
--- a/.github/workflows/php-ci.yml
+++ b/.github/workflows/php-ci.yml
@@ -32,7 +32,7 @@ jobs:
      fail-fast: False
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2

      - name: Show environment
        run: |
@@ -87,22 +87,35 @@ jobs:
      # ------------------------------------------------------------
      - name: Checkout repository
        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Set variables
        id: vars
        run: |
-          # Set git branch or git tag as slug
-          if [[ ${GITHUB_REF} =~ ^refs\/tags\/ ]]; then
-            GIT_TYPE=TAG
-            GIT_SLUG="${GITHUB_REF/refs\/tags\//}"
-          else
-            GIT_TYPE=BRANCH
-            if [ -n "${GITHUB_HEAD_REF}" ]; then
-              GIT_SLUG="${GITHUB_HEAD_REF}"
-            else
-              GIT_SLUG="${GITHUB_REF/refs\/heads\//}"
-            fi
-          fi
+
+          # Retrieve git info (tags, etc)
+          git fetch --all
+
+          # BRANCH, TAG or COMMIT
+          GIT_TYPE="$( \
+            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
+            | sh \
+            | grep '^GIT_TYPE' \
+            | sed 's|.*=||g' \
+          )"
+          # Branch name, Tag name or Commit Hash
+          GIT_SLUG="$( \
+            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
+            | sh \
+            | grep '^GIT_NAME' \
+            | sed 's|.*=||g' \
+          )"
+
+          # Output
+          echo "GIT_TYPE=${GIT_TYPE}"
+          echo "GIT_SLUG=${GIT_SLUG}"
+
          # Export variable
          # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
          echo "GIT_TYPE=${GIT_TYPE}" >> $GITHUB_ENV
--- a/.github/workflows/php-nightly.yml
+++ b/.github/workflows/php-nightly.yml
@@ -26,7 +26,7 @@ jobs:
      fail-fast: False
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2

      - name: Show environment
        run: |
@@ -82,7 +82,7 @@ jobs:
          - '8.1'
        refs:
          - 'master'
-          - '0.114'
+          - '0.118'
    steps:

      # ------------------------------------------------------------
@@ -97,16 +97,29 @@ jobs:
      - name: Set variables
        id: vars
        run: |
-          # Set git branch or git tag as slug
-          if [ -n "$( git tag --points-at HEAD )" ]; then
-            GIT_TYPE=TAG
-            GIT_SLUG="$( git tag --points-at HEAD )"
-          elif [ "$( git rev-parse --abbrev-ref HEAD )" != "HEAD" ]; then
-            GIT_TYPE=BRANCH
-            GIT_SLUG="$( git rev-parse --abbrev-ref HEAD )"
-          else
-            false
-          fi
+
+          # Retrieve git info (tags, etc)
+          git fetch --all
+
+          # BRANCH, TAG or COMMIT
+          GIT_TYPE="$( \
+            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
+            | sh \
+            | grep '^GIT_TYPE' \
+            | sed 's|.*=||g' \
+          )"
+          # Branch name, Tag name or Commit Hash
+          GIT_SLUG="$( \
+            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
+            | sh \
+            | grep '^GIT_NAME' \
+            | sed 's|.*=||g' \
+          )"
+
+          # Output
+          echo "GIT_TYPE=${GIT_TYPE}"
+          echo "GIT_SLUG=${GIT_SLUG}"
+
          # Export variable
          # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
          echo "GIT_TYPE=${GIT_TYPE}" >> $GITHUB_ENV
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 ## Unreleased


+## Release 0.118
+
+#### Fixed
+- Fixed `mdl` rubygem
+
+#### Added
+- [#182](https://github.com/devilbox/docker-php-fpm/issues/182) Added `ioncube` to PHP 7.4
+- Added `sqlsrv` to PHP 7.4
+
+#### Changed
+- Updated xdebug to latest possible version
+
+
 ## Release 0.117

 #### Fixed
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -716,10 +716,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install xdebug \
+	&& pecl install xdebug-2.9.8 \
 	# Enabling
 	&& docker-php-ext-enable xdebug \
 	&& true
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -68,6 +68,7 @@ RUN set -eux \
 		libyaml-dev \
 		libzip-dev \
 		snmp \
+		unixodbc-dev \
 		zlib1g-dev \
 		ca-certificates \
 		git
@@ -87,6 +88,23 @@ RUN set -eux \
 			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
 		fi

+# -------------------- Installing PHP Extension: ioncube --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         Custom extension
+	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
+&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
+&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \
+&& tar xvfz ioncube.tar.gz \
+&& cd ioncube \
+&& cp "ioncube_loader_lin_7.4.so" "${EXTENSION_DIR}/ioncube.so" \
+&& cd ../ \
+&& rm -rf ioncube \
+&& rm -rf ioncube.tar.gz \
+ \
+	&& true
+
+
 # -------------------- Installing PHP Extension: amqp --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -581,6 +599,17 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: sqlsrv --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install sqlsrv \
+	# Enabling
+	&& docker-php-ext-enable sqlsrv \
+	&& true
+
+
 # -------------------- Installing PHP Extension: ssh2 --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -839,6 +868,7 @@ RUN set -eux \
 	libyaml-0-2 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
@@ -1021,6 +1051,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
+	&& php -m | grep -oiE '^sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^ssh2$' \
 	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -437,6 +437,8 @@ RUN set -eux \
 	# Type:         GIT extension
 	&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
 	&& cd /tmp/xdebug \
+	# Custom:       Branch
+	&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
 	# Default:      Install command
 	&& phpize \
 	&& ./configure  --enable-xdebug \
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -437,6 +437,8 @@ RUN set -eux \
 	# Type:         GIT extension
 	&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
 	&& cd /tmp/xdebug \
+	# Custom:       Branch
+	&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
 	# Default:      Install command
 	&& phpize \
 	&& ./configure  --enable-xdebug \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -495,7 +495,7 @@ RUN set -eux \
 	&& gem install rb-inotify -v 0.9.10 \
 	\
 # -------------------- mdl --------------------
-	&& gem install mdl \
+	&& gem install mdl -v 0.5.0 \
 	\
 	\
 	&& rm -rf /root/.gem \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -496,7 +496,7 @@ RUN set -eux \
 	&& gem install rb-inotify -v 0.9.10 \
 	\
 # -------------------- mdl --------------------
-	&& gem install mdl \
+	&& gem install mdl -v 0.5.0 \
 	\
 	\
 	&& rm -rf /root/.gem \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -496,7 +496,7 @@ RUN set -eux \
 	&& gem install rb-inotify -v 0.9.10 \
 	\
 # -------------------- mdl --------------------
-	&& gem install mdl \
+	&& gem install mdl -v 0.5.0 \
 	\
 	\
 	&& rm -rf /root/.gem \
--- a/README.md
+++ b/README.md
@@ -676,7 +676,7 @@ Check out this table to see which Docker image provides what PHP modules.
  <tr>
   <th>7.4</th>
   <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>
-   <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>
+   <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>
  </tr>
  <tr>
   <th>8.0</th>
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -413,7 +413,7 @@ extensions_available:
      build_dep: [libicu-dev]
      run_dep: [libicu63]
  ioncube:
-    disabled: [7.4, 8.0, 8.1]
+    disabled: [8.0, 8.1]
    all:
      type: custom
      command: |
@@ -938,7 +938,7 @@ extensions_available:
  spl:
    already_avail: "{{ php_all_versions }}"
  sqlsrv:
-    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0, 8.1]
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0, 8.1]
    7.0:
      type: pecl
      version: 5.3.0
@@ -1153,13 +1153,18 @@ extensions_available:
    7.0:
      type: pecl
      version: 2.9.0
+    7.1:
+      type: pecl
+      version: 2.9.8
    8.0:
      type: git
      git_url: https://github.com/xdebug/xdebug
+      git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
      configure: --enable-xdebug
    8.1:
      type: git
      git_url: https://github.com/xdebug/xdebug
+      git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
      configure: --enable-xdebug
    all:
      type: pecl
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -277,6 +277,12 @@ gem_available:
      version: 0.5.0
    7.4:
      version: 0.5.0
+    7.3:
+      version: 0.5.0
+    7.2:
+      version: 0.5.0
+    7.1:
+      version: 0.5.0
    7.0:
      version: 0.5.0
    5.6: