Browse Source

[php] Update php-unit to v1.29 (#7839)

* [php] Update php-unit to v1.29

* Delete unit-entypoint.sh
Joan Miquel 2 years ago
parent
commit
fbc82de9b2

+ 0 - 83
frameworks/PHP/php/deploy/unit-entrypoint.sh

@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo "Using entrypoint patch"
-echo "***************************************************************"
-
-curl_put()
-{
-    RET=`/usr/bin/curl -s -w '%{http_code}' -X PUT --data-binary @$1 --unix-socket /var/run/control.unit.sock http://localhost/$2`
-    RET_BODY=${RET::-3}
-    RET_STATUS=$(echo $RET | /usr/bin/tail -c 4)
-    if [ "$RET_STATUS" -ne "200" ]; then
-        echo "$0: Error: HTTP response status code is '$RET_STATUS'"
-        echo "$RET_BODY"
-        return 1
-    else
-        echo "$0: OK: HTTP response status code is '$RET_STATUS'"
-        echo "$RET_BODY"
-    fi
-    return 0
-}
-
-if [ "$1" = "unitd" -o "$1" = "unitd-debug" ]; then
-    if /usr/bin/find "/var/lib/unit/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then
-        echo "$0: /var/lib/unit/ is not empty, skipping initial configuration..."
-    else
-        if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then
-            echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..."
-            /usr/sbin/$1 --control unix:/var/run/control.unit.sock
-
-            while [ ! -S /var/run/control.unit.sock ]; do echo "$0: Waiting for control socket to be created..."; /bin/sleep 0.1; done
-            # even when the control socket exists, it does not mean unit has finished initialisation
-            # this curl call will get a reply once unit is fully launched
-            /usr/bin/curl -s -X GET --unix-socket /var/run/control.unit.sock http://localhost/
-
-            echo "$0: Looking for certificate bundles in /docker-entrypoint.d/..."
-            for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -name "*.pem"); do
-                echo "$0: Uploading certificates bundle: $f"
-                curl_put $f "certificates/$(basename $f .pem)"
-            done
-
-            echo "$0: Looking for configuration snippets in /docker-entrypoint.d/..."
-            for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -name "*.json"); do
-                echo "$0: Applying configuration $f";
-                curl_put $f "config"
-            done
-
-            echo "$0: Looking for shell scripts in /docker-entrypoint.d/..."
-            for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -name "*.sh"); do
-                echo "$0: Launching $f";
-                "$f"
-            done
-
-            # warn on filetypes we don't know what to do with
-            for f in $(/usr/bin/find /docker-entrypoint.d/ -type f -not -name "*.sh" -not -name "*.json" -not -name "*.pem"); do
-                echo "$0: Ignoring $f";
-            done
-
-            echo "$0: Stopping Unit daemon after initial configuration..."
-            kill -TERM `/bin/cat /var/run/unit.pid`
-            for i in {1..5}; do
-              if [[ -S /var/run/control.unit.sock ]]
-              then
-                echo "$0 Waiting for control socket to be removed..."
-                /bin/sleep 1.0
-              else
-                break
-              fi
-            done
-            if [ -S /var/run/control.unit.sock ]; then
-             kill -SIGTERM `/bin/cat /var/run/unit.pid` && rm -f /var/run/control.unit.sock
-            fi
-            echo
-            echo "$0: Unit initial configuration complete; ready for start up..."
-            echo
-        else
-            echo "$0: /docker-entrypoint.d/ is empty, skipping initial configuration..."
-        fi
-    fi
-fi
-
-exec "$@"

+ 1 - 2
frameworks/PHP/php/php-unit.dockerfile

@@ -1,4 +1,4 @@
-FROM nginx/unit:1.28.0-php8.1
+FROM nginx/unit:1.29.0-php8.1
 
 ADD . /php
 WORKDIR /php
@@ -10,5 +10,4 @@ EXPOSE 8080
 
 COPY deploy/nginx-unit.json /docker-entrypoint.d/nginx-unit.json
 
-ENTRYPOINT ["bash", "deploy/unit-entrypoint.sh"]
 CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]