diff --git a/apps/php5/5.4.45/build/config.json b/apps/php5/5.4.45/build/config.json index ac01fcfa..3fa4429d 100644 --- a/apps/php5/5.4.45/build/config.json +++ b/apps/php5/5.4.45/build/config.json @@ -115,7 +115,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" } ], diff --git a/apps/php5/5.5.38/build/config.json b/apps/php5/5.5.38/build/config.json index ac01fcfa..3fa4429d 100644 --- a/apps/php5/5.5.38/build/config.json +++ b/apps/php5/5.5.38/build/config.json @@ -115,7 +115,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" } ], diff --git a/apps/php5/5.6.40/build/config.json b/apps/php5/5.6.40/build/config.json index ac01fcfa..3fa4429d 100644 --- a/apps/php5/5.6.40/build/config.json +++ b/apps/php5/5.6.40/build/config.json @@ -115,7 +115,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" } ], diff --git a/apps/php7/7.0.33/build/config.json b/apps/php7/7.0.33/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php7/7.0.33/build/config.json +++ b/apps/php7/7.0.33/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php7/7.0.33/build/php/extensions/install.sh b/apps/php7/7.0.33/build/php/extensions/install.sh index 1507b0ed..49c22bab 100644 --- a/apps/php7/7.0.33/build/php/extensions/install.sh +++ b/apps/php7/7.0.33/build/php/extensions/install.sh @@ -85,8 +85,14 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,18 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then fi -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 7.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php7/7.1.33/build/config.json b/apps/php7/7.1.33/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php7/7.1.33/build/config.json +++ b/apps/php7/7.1.33/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php7/7.1.33/build/php/extensions/install.sh b/apps/php7/7.1.33/build/php/extensions/install.sh index 1507b0ed..49c22bab 100644 --- a/apps/php7/7.1.33/build/php/extensions/install.sh +++ b/apps/php7/7.1.33/build/php/extensions/install.sh @@ -85,8 +85,14 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,18 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then fi -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 7.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php7/7.2.34/build/config.json b/apps/php7/7.2.34/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php7/7.2.34/build/config.json +++ b/apps/php7/7.2.34/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php7/7.2.34/build/php/extensions/install.sh b/apps/php7/7.2.34/build/php/extensions/install.sh index 1507b0ed..49c22bab 100644 --- a/apps/php7/7.2.34/build/php/extensions/install.sh +++ b/apps/php7/7.2.34/build/php/extensions/install.sh @@ -85,8 +85,14 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,18 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then fi -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 7.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php7/7.3.33/build/config.json b/apps/php7/7.3.33/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php7/7.3.33/build/config.json +++ b/apps/php7/7.3.33/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php7/7.3.33/build/php/extensions/install.sh b/apps/php7/7.3.33/build/php/extensions/install.sh index 1507b0ed..49c22bab 100644 --- a/apps/php7/7.3.33/build/php/extensions/install.sh +++ b/apps/php7/7.3.33/build/php/extensions/install.sh @@ -85,8 +85,14 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,18 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then fi -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 7.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php7/7.4.33/build/config.json b/apps/php7/7.4.33/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php7/7.4.33/build/config.json +++ b/apps/php7/7.4.33/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php7/7.4.33/build/php/extensions/install.sh b/apps/php7/7.4.33/build/php/extensions/install.sh index 1507b0ed..49c22bab 100644 --- a/apps/php7/7.4.33/build/php/extensions/install.sh +++ b/apps/php7/7.4.33/build/php/extensions/install.sh @@ -85,8 +85,14 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,18 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then fi -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 7.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php8/8.0.30/build/config.json b/apps/php8/8.0.30/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php8/8.0.30/build/config.json +++ b/apps/php8/8.0.30/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php8/8.0.30/build/php/extensions/install.sh b/apps/php8/8.0.30/build/php/extensions/install.sh index 38a3b00b..bbca7095 100644 --- a/apps/php8/8.0.30/build/php/extensions/install.sh +++ b/apps/php8/8.0.30/build/php/extensions/install.sh @@ -79,6 +79,7 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi @@ -86,6 +87,11 @@ if [[ -z "${EXTENSIONS##*,memcached,*}" ]]; then echo "---------- Install memcached ----------" install-php-extensions memcached fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,19 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then docker-php-ext-enable igbinary fi - -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 8 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 8.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 8 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php8/8.1.27/build/config.json b/apps/php8/8.1.27/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php8/8.1.27/build/config.json +++ b/apps/php8/8.1.27/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php8/8.1.27/build/php/extensions/install.sh b/apps/php8/8.1.27/build/php/extensions/install.sh index 38a3b00b..bbca7095 100644 --- a/apps/php8/8.1.27/build/php/extensions/install.sh +++ b/apps/php8/8.1.27/build/php/extensions/install.sh @@ -79,6 +79,7 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi @@ -86,6 +87,11 @@ if [[ -z "${EXTENSIONS##*,memcached,*}" ]]; then echo "---------- Install memcached ----------" install-php-extensions memcached fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,19 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then docker-php-ext-enable igbinary fi - -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 8 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 8.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 8 0 if [[ "$?" = "1" ]]; then diff --git a/apps/php8/8.2.15/build/config.json b/apps/php8/8.2.15/build/config.json index bda2e4eb..28ee3c56 100644 --- a/apps/php8/8.2.15/build/config.json +++ b/apps/php8/8.2.15/build/config.json @@ -119,7 +119,7 @@ "value": "curl" }, { - "label": "sg11", + "label": "sg15", "value": "sourceguardian" }, { diff --git a/apps/php8/8.2.15/build/php/extensions/install.sh b/apps/php8/8.2.15/build/php/extensions/install.sh index 38a3b00b..bbca7095 100644 --- a/apps/php8/8.2.15/build/php/extensions/install.sh +++ b/apps/php8/8.2.15/build/php/extensions/install.sh @@ -79,6 +79,7 @@ fi if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then echo "---------- Install sourceguardian ----------" + apk add eudev-libs install-php-extensions sourceguardian fi @@ -86,6 +87,11 @@ if [[ -z "${EXTENSIONS##*,memcached,*}" ]]; then echo "---------- Install memcached ----------" install-php-extensions memcached fi + +if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then + echo "---------- Install ssh2 ----------" + install-php-extensions ssh2 +fi # end @@ -395,19 +401,6 @@ if [[ -z "${EXTENSIONS##*,igbinary,*}" ]]; then docker-php-ext-enable igbinary fi - -if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then - isPhpVersionGreaterOrEqual 8 0 - if [[ "$?" = "1" ]]; then - echo "---------- Install ssh2 ----------" - printf "\n" | apk add libssh2-dev - pecl install ssh2-1.1.2 - docker-php-ext-enable ssh2 - else - echo "ssh2 requires PHP >= 8.0.0, installed version is ${PHP_VERSION}" - fi -fi - if [[ -z "${EXTENSIONS##*,protobuf,*}" ]]; then isPhpVersionGreaterOrEqual 8 0 if [[ "$?" = "1" ]]; then