Merge pull request #159 from devilbox/release-0.107

Release 0.107
devilbox · Jun 27, 2020 · 1028527 · 1028527
2 parents de9642c + 0a04342
commit 1028527
Show file tree

Hide file tree

Showing 30 changed files with 246 additions and 142 deletions.
diff --git a/.github/workflows/php-ci.yml b/.github/workflows/php-ci.yml
@@ -118,8 +118,8 @@ jobs:
       - name: Build Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -135,8 +135,8 @@ jobs:
       - name: Test Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -156,8 +156,8 @@ jobs:
       - name: Build Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -173,8 +173,8 @@ jobs:
       - name: Test Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -194,8 +194,8 @@ jobs:
       - name: Build Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -211,8 +211,8 @@ jobs:
       - name: Test Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -232,8 +232,8 @@ jobs:
       - name: Build Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -249,8 +249,8 @@ jobs:
       - name: Test Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -283,8 +283,8 @@ jobs:
       - name: Publish images (only repo owner)
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;

diff --git a/.github/workflows/php-nightly.yml b/.github/workflows/php-nightly.yml
@@ -15,7 +15,6 @@ on:
     - cron: '0 0 * * *'
 
 
-
 # -------------------------------------------------------------------------------------------------
 # What to run
 # -------------------------------------------------------------------------------------------------
@@ -55,6 +54,12 @@ jobs:
           RUNNER_CONTEXT: ${{ toJson(runner) }}
         run: echo "${RUNNER_CONTEXT}"
 
+      - name: Show git info
+        env:
+          RUNNER_CONTEXT: ${{ toJson(runner) }}
+        run: |
+          git log | head -20
+
 
   build:
     name: "[ ${{ matrix.version }} ]"
@@ -113,8 +118,8 @@ jobs:
       - name: Build Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -130,8 +135,8 @@ jobs:
       - name: Test Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -151,8 +156,8 @@ jobs:
       - name: Build Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -168,8 +173,8 @@ jobs:
       - name: Test Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -189,8 +194,8 @@ jobs:
       - name: Build Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -206,8 +211,8 @@ jobs:
       - name: Test Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -227,8 +232,8 @@ jobs:
       - name: Build Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -244,8 +249,8 @@ jobs:
       - name: Test Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -278,8 +283,8 @@ jobs:
       - name: Publish images (only repo owner)
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;

diff --git a/.travis.yml b/.travis.yml
@@ -15,13 +15,6 @@ services:
 env:
   global:
     - IMAGE: devilbox/php-fpm
-    # travis encrypt DOCKER_USERNAME=user
-    # travis encrypt DOCKER_PASSWORD=pass
-    # Must be regenerated when repository name/owner changes
-    # DOCKER_USERNAME
-    - secure: "Y7xt3qZW9Zwrsgdd/aCf8ZqA7I039506ZDf/u/WVzGwNHta5YJJ7XYy8XG7XugyqGGXRVpfBiaqmDH4xsPLXyHXdOt2G38GXZHZXIgJOiEJ6aUfpdUxyeu8XIXkD2MDMmc3Kb27Yub/OadxRMLWEflzRnSXXs3KJ8TsbPHh0yRWDMsmHYOYl16gDGUX1izLkEx4J+9iA3+JwIFZk8by/OUuIIQ93bSNORpwHT8A1j7Y1kh8kYkPZ6nRxWO8xrc2wI1Rbp0X+ivLnOotxDZo53UI/0KroeSckDpoWfoz+B7mP+M+5B6kGlI2pKDNQB/ErYvnya6PdtFSS9skbvepR4tBhUOZDDY7NMRg9m3w0b9T1no+g3A4LBGXy6+OZZoiYAGy9LvqMhFkINqbBhRBX+mZhtG0pNXunfcu5dk81Ni/XpXDiy9JU98jItwsRj4SeaPfSt0LUNNXMS/fEwZyTy6TihN1CM3krJpV30Ic5rN64FRnrRjUuNU4lJ/W36yUhM29gb13ahh+f7sDsYoCzMwDM9HFe0YLb3ar3mW1lb3FuUugU2f2EupgCPY60X2XrY9aSgCfbdiVsA84dbLtRfHTPG7UbEcJW5RH8HS+9qVZBK+AcPqon9jbOJRVh7q99YW+R8X/XeyYpz7amacVmRus80+toZ16bbU7D2Qgjdek="
-    # DOCKER_PASSWORD
-    - secure: "ZRrVOVOkSCS2UxEi1HNF1iKefK4sDT/sPRl1HxMQjLnRRaAMdG0aRnBwQf2YAM2qzhCfN85qt6zZtC4awc2mHiZ88JrAZxBjK6xj4BwOyLbDuzpBsKXnx8Nix+wyYYKSjsC3LOYrsUe+4rvkw3tVvVaX8G2llojwdksF34VDmmHBmzCG/Bsexk7UqC+qw0PZm7BtctQO+IL0btmMDijRDElxfR+AuPvf9JdkhYzw9TOO7Jqd53NssNVGyL+XSV0dfGn8PkZTp1e8D+28pLK4oGVog+Wk7Cq94hSGjk5AkWKvL5441rupG1AA8K3njeDNMKdov4o+dmnkAH7Jh8tjShMhNhoxHce3IzpczjhoE1EyYQcyPf1qdfhV35Xv096iWX5809pp1MZF2oE5eism8JaU9NpGClryVbKVKtup8ko9/tCqz01Czq5Vue40feMkGtdePulg59OhyyPLYldsObw8QlZydkrmgVZe6b+GyybeiHraTfDq4pvTgUrC4Cmm5J3IB5Ig1THEiYKHfRJ5hSSMDDODeBXc8Xh6mFssEVshNx/jbUQWuAVYQFw/GIquVHxr6btbevrWIoD+zmqcc0L98u9pYH8w7b+gMgVJNCC4QQz2NCGGWw9l9/TmLrKJgeXbG18n8D314le1zuna6/VfH9pXIlbNO4hgz5NLHJk="
   matrix:
     - PHP=5.2
     - PHP=5.3
@@ -103,44 +96,44 @@ before_script:
 ###
 script:
   - if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-      echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
+      make login USERNAME="${DOCKER_USERNAME}" PASSWORD="${DOCKER_PASSWORD}";
       if [ "${TRAVIS_BRANCH}" == "master" ]; then
         echo "Pushing latest";
-        until docker push "${IMAGE}:${PHP}-base"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-mods"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-prod"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-work"; do sleep 1; done;
+        make push TAG="${PHP}-base" &&
+        make push TAG="${PHP}-mods" &&
+        make push TAG="${PHP}-prod" &&
+        make push TAG="${PHP}-work";
       elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
         echo "Pushing branch ${TRAVIS_BRANCH}";
-        docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" &&
-        docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" &&
-        docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" &&
-        docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}" &&
-        until docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; do sleep 1; done;
+        make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${TRAVIS_BRANCH}" &&
+        make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${TRAVIS_BRANCH}" &&
+        make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${TRAVIS_BRANCH}" &&
+        make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-base-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-mods-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-prod-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-work-${TRAVIS_BRANCH}";
       elif [ -n "${TRAVIS_TAG}" ]; then
         echo "Pushing tag ${TRAVIS_TAG}";
-        docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" &&
-        docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" &&
-        docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" &&
-        docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_TAG}" &&
-        until docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; do sleep 1; done;
-        until docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; do sleep 1; done;
+        make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${TRAVIS_TAG}" &&
+        make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${TRAVIS_TAG}" &&
+        make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${TRAVIS_TAG}" &&
+        make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-base-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-mods-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-prod-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-work-${TRAVIS_TAG}";
       elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
         if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then
           echo "Pushing cron tag ${MY_TAG}";
-          docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${MY_TAG}" &&
-          docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" &&
-          docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" &&
-          docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" &&
-          until docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; do sleep 1; done;
-          until docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; do sleep 1; done;
-          until docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; do sleep 1; done;
-          until docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; do sleep 1; done;
+          make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${MY_TAG}" &&
+          make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${MY_TAG}" &&
+          make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${MY_TAG}" &&
+          make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${MY_TAG}" &&
+          make push TAG="${PHP}-base-${MY_TAG}" &&
+          make push TAG="${PHP}-mods-${MY_TAG}" &&
+          make push TAG="${PHP}-prod-${MY_TAG}" &&
+          make push TAG="${PHP}-work-${MY_TAG}";
         fi
       else
         echo "Skipping push to dockerhub on normal branches";

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@
 ## Unreleased
 
 
+## Release 0.107
+
+#### Fixed
+- Fixes login to Dockerhub for CI jobs
+- Fixes imagick segfault by setting its threads to 1
+
+#### Added
+- Re-added imap for PHP 7.4
+- Adding `certbot` binary
+
+
 ## Release 0.106
 
 #### Fixed

diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
@@ -26,6 +26,7 @@ RUN set -eux \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
+		libmagickwand-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -41,6 +42,7 @@ RUN set -eux \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
+		libwebp5 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -194,6 +196,19 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: imagick --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install imagick \
+	# Enabling
+	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
+	&& true
+
+
 # -------------------- Installing PHP Extension: imap --------------------
 RUN set -eux \
 	# Generic pre-command
@@ -696,6 +711,7 @@ RUN set -eux \
 	libfreetype6 \
 	libicu52 \
 	libjpeg62-turbo \
+	libmagickwand-6.q16-2 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libmysqlclient18 \
@@ -708,6 +724,7 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy-0.99-0 \
 	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -722,6 +739,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- oci8 ----------
 	&& 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 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -790,6 +809,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^iconv$' \
 	&& php -m | grep -oiE '^igbinary$' \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
+	&& php -m | grep -oiE '^imagick$' \
+	&& php-fpm -m | grep -oiE '^imagick$' \
 	&& php -m | grep -oiE '^imap$' \
 	&& php-fpm -m | grep -oiE '^imap$' \
 	&& php -m | grep -oiE '^interbase$' \