Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): remove deprecated local-php-security-checker on all php versions #1438

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 0 additions & 5 deletions php/8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@ 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

# 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 \
Expand Down Expand Up @@ -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 && \
Expand Down
5 changes: 0 additions & 5 deletions php/8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@ 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

# 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 \
Expand Down Expand Up @@ -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 && \
Expand Down
5 changes: 0 additions & 5 deletions php/8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@ 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

# 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 \
Expand Down Expand Up @@ -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 && \
Expand Down
2 changes: 0 additions & 2 deletions php/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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":
Expand Down
Loading