diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ff0a6b5d..58b5dfc79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Versions ======== +2024-09-30 +---------- +* PHP: remove local-php-security-checker on all images (abandoned, now use composer audit) + 2024-09-02 ---------- * Sonar: fix analysis for amd64 diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile index c3a14c143..bbb0043b2 100644 --- a/php/8.1/Dockerfile +++ b/php/8.1/Dockerfile @@ -7,7 +7,6 @@ ARG MEMCACHED_VERSION ARG MODD_VERSION ARG PHP_CS_FIXER_VERSION ARG REDIS_VERSION -ARG SECURITY_CHECKER_VERSION ARG SSH2_VERSION ARG XDEBUG_VERSION ARG TARGETARCH @@ -15,11 +14,9 @@ ARG TARGETARCH # iconv issue https://github.com/docker-library/php/issues/240 FROM base AS base-amd64 ARG MODD_ARCH="linux64" -ARG SECURITY_CHECKER_ARCH="linux_amd64" FROM base AS base-arm64 ARG MODD_ARCH="linuxARM" -ARG SECURITY_CHECKER_ARCH="linux_arm64" FROM base-$TARGETARCH ENV COMPOSER_NO_INTERACTION=1 \ @@ -57,8 +54,6 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ " > /usr/local/etc/php/php.ini && \ curl -sSL https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/local/bin/composer && chmod a+x /usr/local/bin/composer && \ curl -sSL https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${PHP_CS_FIXER_VERSION}/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && chmod a+x /usr/local/bin/php-cs-fixer && \ - curl -sSL https://github.com/fabpot/local-php-security-checker/releases/download/v${SECURITY_CHECKER_VERSION}/local-php-security-checker_${SECURITY_CHECKER_VERSION}_${SECURITY_CHECKER_ARCH} -o /usr/local/bin/local-php-security-checker && chmod a+x /usr/local/bin/local-php-security-checker && \ - ln -s local-php-security-checker /usr/local/bin/security-checker && \ curl -sSL https://github.com/phpredis/phpredis/archive/${REDIS_VERSION}.tar.gz | tar xz -C /tmp && \ cd /tmp/phpredis-${REDIS_VERSION} && phpize && ./configure && make && make install && \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \ diff --git a/php/8.2/Dockerfile b/php/8.2/Dockerfile index 770e13f9e..e881921c8 100644 --- a/php/8.2/Dockerfile +++ b/php/8.2/Dockerfile @@ -7,7 +7,6 @@ ARG MEMCACHED_VERSION ARG MODD_VERSION ARG PHP_CS_FIXER_VERSION ARG REDIS_VERSION -ARG SECURITY_CHECKER_VERSION ARG SSH2_VERSION ARG XDEBUG_VERSION ARG TARGETARCH @@ -15,11 +14,9 @@ ARG TARGETARCH # iconv issue https://github.com/docker-library/php/issues/240 FROM base AS base-amd64 ARG MODD_ARCH="linux64" -ARG SECURITY_CHECKER_ARCH="linux_amd64" FROM base AS base-arm64 ARG MODD_ARCH="linuxARM" -ARG SECURITY_CHECKER_ARCH="linux_arm64" FROM base-$TARGETARCH ENV COMPOSER_NO_INTERACTION=1 \ @@ -57,8 +54,6 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ " > /usr/local/etc/php/php.ini && \ curl -sSL https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/local/bin/composer && chmod a+x /usr/local/bin/composer && \ curl -sSL https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${PHP_CS_FIXER_VERSION}/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && chmod a+x /usr/local/bin/php-cs-fixer && \ - curl -sSL https://github.com/fabpot/local-php-security-checker/releases/download/v${SECURITY_CHECKER_VERSION}/local-php-security-checker_${SECURITY_CHECKER_VERSION}_${SECURITY_CHECKER_ARCH} -o /usr/local/bin/local-php-security-checker && chmod a+x /usr/local/bin/local-php-security-checker && \ - ln -s local-php-security-checker /usr/local/bin/security-checker && \ curl -sSL https://github.com/phpredis/phpredis/archive/${REDIS_VERSION}.tar.gz | tar xz -C /tmp && \ cd /tmp/phpredis-${REDIS_VERSION} && phpize && ./configure && make && make install && \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \ diff --git a/php/8.3/Dockerfile b/php/8.3/Dockerfile index a063b0489..e1a722c0f 100644 --- a/php/8.3/Dockerfile +++ b/php/8.3/Dockerfile @@ -7,7 +7,6 @@ ARG MEMCACHED_VERSION ARG MODD_VERSION ARG PHP_CS_FIXER_VERSION ARG REDIS_VERSION -ARG SECURITY_CHECKER_VERSION ARG SSH2_VERSION ARG XDEBUG_VERSION ARG TARGETARCH @@ -15,11 +14,9 @@ ARG TARGETARCH # iconv issue https://github.com/docker-library/php/issues/240 FROM base AS base-amd64 ARG MODD_ARCH="linux64" -ARG SECURITY_CHECKER_ARCH="linux_amd64" FROM base AS base-arm64 ARG MODD_ARCH="linuxARM" -ARG SECURITY_CHECKER_ARCH="linux_arm64" FROM base-$TARGETARCH ENV COMPOSER_NO_INTERACTION=1 \ @@ -56,8 +53,6 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ " > /usr/local/etc/php/php.ini && \ curl -sSL https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/local/bin/composer && chmod a+x /usr/local/bin/composer && \ curl -sSL https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${PHP_CS_FIXER_VERSION}/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && chmod a+x /usr/local/bin/php-cs-fixer && \ - curl -sSL https://github.com/fabpot/local-php-security-checker/releases/download/v${SECURITY_CHECKER_VERSION}/local-php-security-checker_${SECURITY_CHECKER_VERSION}_${SECURITY_CHECKER_ARCH} -o /usr/local/bin/local-php-security-checker && chmod a+x /usr/local/bin/local-php-security-checker && \ - ln -s local-php-security-checker /usr/local/bin/security-checker && \ curl -sSL https://github.com/phpredis/phpredis/archive/${REDIS_VERSION}.tar.gz | tar xz -C /tmp && \ cd /tmp/phpredis-${REDIS_VERSION} && phpize && ./configure && make && make install && \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \ diff --git a/php/config.yml b/php/config.yml index 0c886ad5c..ab49a609b 100644 --- a/php/config.yml +++ b/php/config.yml @@ -9,7 +9,6 @@ test_config: &test_config - composer --version - modd --version - php-cs-fixer --version - - security-checker -help - php /tmp/test.php - aws --version build_args: &build_args @@ -19,7 +18,6 @@ build_args: &build_args MODD_VERSION: *MODD_VERSION PHP_CS_FIXER_VERSION: 3.41.1 REDIS_VERSION: 5.3.7 - SECURITY_CHECKER_VERSION: 2.0.6 XDEBUG_VERSION: 3.3.1 versions: "8.1":