From b9555fc2568aa562eb96367da70c364018637281 Mon Sep 17 00:00:00 2001 From: Bruce Dou Date: Sun, 29 Dec 2024 11:46:31 +0000 Subject: [PATCH 1/2] support >= 8.2 --- .github/workflows/build_images.yml | 2 +- generate | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml index 6c902cc..0001933 100644 --- a/.github/workflows/build_images.yml +++ b/.github/workflows/build_images.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - php: ["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"] + php: ["8.2", "8.3", "8.4"] steps: - diff --git a/generate b/generate index 384a993..a58fd50 100755 --- a/generate +++ b/generate @@ -32,7 +32,7 @@ function replace_hook_string(string $string, $from, $to): string } $standard_template = file_get_contents(__DIR__ . '/templates/standard/Dockerfile'); -$standard_tags = ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', 'latest']; +$standard_tags = ['8.2', '8.3', '8.4', 'latest']; foreach ($standard_tags as $tag) { $content = replace_hook_string($standard_template, 'tag', $tag); @mkdir(__DIR__ . '/' . $tag); @@ -41,7 +41,7 @@ foreach ($standard_tags as $tag) { // generate alpine $alpine_template = file_get_contents(__DIR__ . '/templates/alpine/Dockerfile'); -$alpine_tags = ['7.2-alpine', '7.3-alpine', '7.4-alpine', '8.0-alpine', '8.1-alpine', '8.2-alpine', '8.3-alpine', 'latest-alpine']; +$alpine_tags = ['8.2-alpine', '8.3-alpine', '8.4-alpine', 'latest-alpine']; foreach ($alpine_tags as $tag) { $content = replace_hook_string($alpine_template, 'tag', $tag); @mkdir(__DIR__ . '/' . $tag); From d4fdfeed6d95f36f4c0301d6e5c437da827e276d Mon Sep 17 00:00:00 2001 From: Bruce Dou Date: Sun, 29 Dec 2024 11:50:24 +0000 Subject: [PATCH 2/2] added php8.4 --- 8.2/Dockerfile | 2 +- 8.3-alpine/Dockerfile | 4 +-- 8.3/Dockerfile | 4 +-- 8.4-alpine/Dockerfile | 64 +++++++++++++++++++++++++++++++++++ 8.4/Dockerfile | 50 +++++++++++++++++++++++++++ latest-alpine/Dockerfile | 2 +- latest/Dockerfile | 2 +- templates/alpine/Dockerfile | 2 +- templates/standard/Dockerfile | 2 +- 9 files changed, 123 insertions(+), 9 deletions(-) create mode 100644 8.4-alpine/Dockerfile create mode 100644 8.4/Dockerfile diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 8851dc8..dbffef9 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.2 -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apt update -y diff --git a/8.3-alpine/Dockerfile b/8.3-alpine/Dockerfile index 58a5d16..131affd 100644 --- a/8.3-alpine/Dockerfile +++ b/8.3-alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.3.0RC5-cli-alpine3.18 +FROM php:8.3-alpine -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apk update diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 4d7b4ae..79bb9bc 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.3.0RC5-cli +FROM php:8.3 -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apt update -y diff --git a/8.4-alpine/Dockerfile b/8.4-alpine/Dockerfile new file mode 100644 index 0000000..1a92d55 --- /dev/null +++ b/8.4-alpine/Dockerfile @@ -0,0 +1,64 @@ +FROM php:8.4-alpine + +MAINTAINER Open Swoole Group + +RUN apk update + +# common tools +RUN apk add --no-cache \ + bash \ + curl \ + wget \ + zip \ + unzip \ + git \ + vim + +# dev tools +RUN apk add --no-cache \ + autoconf \ + automake \ + c-ares \ + c-ares-dev \ + dpkg \ + dpkg-dev \ + file \ + g++ \ + gcc \ + libgcc \ + libstdc++ \ + libtool \ + make \ + openssl \ + openssl-dev \ + pcre-dev \ + pkgconf \ + re2c \ + zlib \ + zlib-dev \ + libcurl \ + libpq-dev \ + curl-dev + + +# extensions +RUN docker-php-ext-install \ + pdo_mysql \ + mysqli \ + opcache \ + sockets \ + pcntl && \ + echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \ + pecl install redis && docker-php-ext-enable redis + +# install composer +ENV COMPOSER_ALLOW_SUPERUSER 1 +RUN curl -sS https://getcomposer.org/installer | php && \ + mv composer.phar /usr/local/bin/composer && \ + composer self-update --clean-backups + +# dev tools +RUN apk add --no-cache \ + gdb \ + strace \ + valgrind diff --git a/8.4/Dockerfile b/8.4/Dockerfile new file mode 100644 index 0000000..9cd5aad --- /dev/null +++ b/8.4/Dockerfile @@ -0,0 +1,50 @@ +FROM php:8.4 + +MAINTAINER Open Swoole Group + +RUN apt update -y + +RUN apt install -y \ + procps \ + libfreetype6-dev \ + libjpeg62-turbo-dev \ + libpng-dev \ + openssl \ + libssh-dev \ + libpcre3 \ + libpcre3-dev \ + libonig-dev \ + libcurl4-openssl-dev \ + libc-ares-dev \ + libpq-dev \ + curl \ + wget \ + zip \ + unzip \ + git \ + vim + +RUN docker-php-ext-install \ + gd \ + pdo_mysql \ + mysqli \ + opcache \ + sockets \ + pcntl && \ + echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini && \ + pecl install redis && docker-php-ext-enable redis + +# install composer +ENV COMPOSER_ALLOW_SUPERUSER 1 +RUN curl -sS https://getcomposer.org/installer | php && \ + mv composer.phar /usr/local/bin/composer && \ + composer self-update --clean-backups + +# dev-tools +RUN apt install -y \ + gdb \ + strace \ + valgrind + +# clean up +RUN apt autoremove && apt clean diff --git a/latest-alpine/Dockerfile b/latest-alpine/Dockerfile index f5be8b7..440b463 100644 --- a/latest-alpine/Dockerfile +++ b/latest-alpine/Dockerfile @@ -1,6 +1,6 @@ FROM php:latest-alpine -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apk update diff --git a/latest/Dockerfile b/latest/Dockerfile index d91bceb..7ae0e21 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -1,6 +1,6 @@ FROM php:latest -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apt update -y diff --git a/templates/alpine/Dockerfile b/templates/alpine/Dockerfile index cbcd96d..e7264b1 100644 --- a/templates/alpine/Dockerfile +++ b/templates/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM php:{{tag}} -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apk update diff --git a/templates/standard/Dockerfile b/templates/standard/Dockerfile index 923ee0e..88a44f0 100644 --- a/templates/standard/Dockerfile +++ b/templates/standard/Dockerfile @@ -1,6 +1,6 @@ FROM php:{{tag}} -MAINTAINER Open Swoole Group +MAINTAINER Open Swoole Group RUN apt update -y