Skip to content

Commit

Permalink
upgrade PHP & Composer in latest images
Browse files Browse the repository at this point in the history
  • Loading branch information
deminy committed Oct 6, 2023
1 parent 42064a2 commit c06c07d
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Table of Contents

### Changed
- Upgrade PHP extension _Redis_ from 5.3.7 to 6.0.1.
- Upgrade _Composer_ from 2.5.5 to 2.6.4.
- Upgrade _Composer_ from 2.5.5 to 2.6.5.

# Swoole 5.0

Expand Down
8 changes: 4 additions & 4 deletions config/5.1.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
status: "under development"
php:
- "8.0.30"
- "8.1.23"
- "8.2.10"
- "8.3.0RC2"
- "8.1.24"
- "8.2.11"
- "8.3.0RC3"
image:
composer:
version: "2.6.4"
version: "2.6.5"
php_extensions:
redis:
version: "6.0.1"
Expand Down
4 changes: 2 additions & 2 deletions config/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ php:
- "8.0"
- "8.1"
- "8.2"
- "8.3.0RC2"
- "8.3.0RC3"
image:
composer:
version: "2.6.4"
version: "2.6.5"
inotify: true
php_extensions:
redis:
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/5.1.0/php8.0/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/5.1.0/php8.0/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
libcurl4-openssl-dev \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/5.1.0/php8.1/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM php:8.1.23-cli-alpine3.18
FROM php:8.1.24-cli-alpine3.18

RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/5.1.0/php8.1/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1.23-cli
FROM php:8.1.24-cli

ENV DEBIAN_FRONTEND noninteractive
ENV TERM xterm-color
Expand All @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
libcurl4-openssl-dev \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/5.1.0/php8.2/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM php:8.2.10-cli-alpine3.18
FROM php:8.2.11-cli-alpine3.18

RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev linux-headers postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/5.1.0/php8.2/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2.10-cli
FROM php:8.2.11-cli

ENV DEBIAN_FRONTEND noninteractive
ENV TERM xterm-color
Expand All @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
libcurl4-openssl-dev \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/5.1.0/php8.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM php:8.3.0RC2-cli-alpine3.18
FROM php:8.3.0RC3-cli-alpine3.18

RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev linux-headers postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/5.1.0/php8.3/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.0RC2-cli
FROM php:8.3.0RC3-cli

ENV DEBIAN_FRONTEND noninteractive
ENV TERM xterm-color
Expand All @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
libcurl4-openssl-dev \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/nightly/php8.0/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/nightly/php8.0/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
# The auto-reloading feature is supported for non-Alpine images only.
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/nightly/php8.1/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/nightly/php8.1/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
# The auto-reloading feature is supported for non-Alpine images only.
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/nightly/php8.2/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev linux-headers postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/nightly/php8.2/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
# The auto-reloading feature is supported for non-Alpine images only.
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/nightly/php8.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM php:8.3.0RC2-cli-alpine3.18
FROM php:8.3.0RC3-cli-alpine3.18

RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update --clean-backups 2.6.4 && \
composer self-update --clean-backups 2.6.5 && \
apk update && \
apk add --no-cache libstdc++ libpq && \
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev linux-headers postgresql-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/nightly/php8.3/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.0RC2-cli
FROM php:8.3.0RC3-cli

ENV DEBIAN_FRONTEND noninteractive
ENV TERM xterm-color
Expand All @@ -12,7 +12,7 @@ RUN \
set -ex && \
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
chmod +x /usr/bin/composer && \
composer self-update 2.6.4 && \
composer self-update 2.6.5 && \
apt-get update && \
apt-get install -y \
# The auto-reloading feature is supported for non-Alpine images only.
Expand Down

0 comments on commit c06c07d

Please sign in to comment.