diff --git a/Taskfile.yml b/Taskfile.yml index 89b5282..d4f31b6 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -64,7 +64,7 @@ tasks: - docker buildx create --name mybuilder --bootstrap --use clean-images: - - docker images -qa | xargs docker rmi -f + - docker images -a | grep ghcr.io/nuvolaris | awk '{print $3}' | xargs docker rmi -f - yes | docker buildx prune build-common: diff --git a/runtime/php/v8.0/Dockerfile b/runtime/php/v8.0/Dockerfile index 9735d8d..b6c6f4f 100644 --- a/runtime/php/v8.0/Dockerfile +++ b/runtime/php/v8.0/Dockerfile @@ -21,6 +21,7 @@ ARG COMMON=missing:missing FROM ${COMMON} as builder FROM php:8.0-cli-buster +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ # install PHP extensions RUN apt-get -y update \ @@ -46,38 +47,29 @@ RUN apt-get -y update \ libzip-dev \ postgresql-server-dev-11 \ \ - && docker-php-ext-install \ + && install-php-extensions \ bcmath \ gd \ intl \ - pgsql \ mysqli \ + mongodb \ opcache \ + pgsql \ pdo_mysql \ pdo_pgsql \ + redis \ soap \ zip \ \ - && mkdir -p /usr/src/php/ext/mongodb \ - && curl -fsSL https://pecl.php.net/get/mongodb-1.9.0RC1 | tar xvz -C "/usr/src/php/ext/mongodb" --strip 1 \ - && docker-php-ext-install -j$(nproc) mongodb \ - \ - && pecl install -o -f redis \ - && rm -rf /tmp/pear \ - && docker-php-ext-enable redis \ - \ && apt-get purge -y --auto-remove $PHPIZE_DEPS \ - && apt-get purge -y --auto-remove libclang-common-7-dev clang-7 llvm-7 llvm-7-dev \ - && apt-get purge -y --auto-remove libfreetype6-dev \ - libicu-dev \ + && apt-get purge -y --autoremove libfreetype6-dev \ libjpeg-dev \ libpng-dev \ libssl-dev \ - libxml2-dev \ libzip-dev \ - postgresql-server-dev-11 \ + && apt-get purge -y --auto-remove libclang-common-7-dev clang-7 llvm-7 llvm-7-dev \ && apt-get autoremove -y \ - && apt-get clean -y \ + && apt-get clean -y \ && rm -rf /usr/src/php COPY php.ini /usr/local/etc/php diff --git a/runtime/php/v8.0/composer.json b/runtime/php/v8.0/composer.json index 8380a12..7ca0e64 100644 --- a/runtime/php/v8.0/composer.json +++ b/runtime/php/v8.0/composer.json @@ -6,6 +6,7 @@ }, "require": { "guzzlehttp/guzzle": "7.2.0", - "ramsey/uuid": "4.1.1" + "ramsey/uuid": "4.1.1", + "league/flysystem": "^2.0" } } diff --git a/runtime/php/v8.1/Dockerfile b/runtime/php/v8.1/Dockerfile index d3a4318..741b583 100644 --- a/runtime/php/v8.1/Dockerfile +++ b/runtime/php/v8.1/Dockerfile @@ -20,6 +20,7 @@ ARG COMMON=missing:missing FROM ${COMMON} as builder FROM php:8.1-cli-bullseye +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ # install PHP extensions RUN apt-get -y update \ @@ -45,26 +46,20 @@ RUN apt-get -y update \ libzip-dev \ postgresql-server-dev-13 \ \ - && docker-php-ext-install \ + && install-php-extensions \ bcmath \ gd \ intl \ - pgsql \ mysqli \ + mongodb \ opcache \ + pgsql \ pdo_mysql \ pdo_pgsql \ + redis \ soap \ zip \ \ - && mkdir -p /usr/src/php/ext/mongodb \ - && curl -fsSL https://pecl.php.net/get/mongodb-1.14.0 | tar xvz -C "/usr/src/php/ext/mongodb" --strip 1 \ - && docker-php-ext-install -j$(nproc) mongodb \ - \ - && pecl install -o -f redis \ - && rm -rf /tmp/pear \ - && docker-php-ext-enable redis \ - \ && apt-get purge -y --auto-remove $PHPIZE_DEPS \ && apt-get purge -y --auto-remove libfreetype6-dev \ libicu-dev \ diff --git a/runtime/php/v8.1/composer.json b/runtime/php/v8.1/composer.json index d4512a4..70663cb 100644 --- a/runtime/php/v8.1/composer.json +++ b/runtime/php/v8.1/composer.json @@ -7,6 +7,6 @@ "require": { "guzzlehttp/guzzle": "7.4.5", "ramsey/uuid": "4.4.0", - "openai-php/client": "v0.8.5" + "league/flysystem": "^3.0" } } diff --git a/runtime/php/v8.2/Dockerfile b/runtime/php/v8.2/Dockerfile index 8138e43..d3ed0af 100644 --- a/runtime/php/v8.2/Dockerfile +++ b/runtime/php/v8.2/Dockerfile @@ -20,6 +20,7 @@ ARG COMMON=missing:missing FROM ${COMMON} as builder FROM php:8.2-cli-bullseye +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ # install PHP extensions RUN apt-get -y update \ @@ -45,26 +46,20 @@ RUN apt-get -y update \ libzip-dev \ postgresql-server-dev-13 \ \ - && docker-php-ext-install \ + && install-php-extensions \ bcmath \ gd \ intl \ - pgsql \ mysqli \ + mongodb \ opcache \ + pgsql \ pdo_mysql \ pdo_pgsql \ + redis \ soap \ zip \ \ - && mkdir -p /usr/src/php/ext/mongodb \ - && curl -fsSL https://pecl.php.net/get/mongodb-1.14.0 | tar xvz -C "/usr/src/php/ext/mongodb" --strip 1 \ - && docker-php-ext-install -j$(nproc) mongodb \ - \ - && pecl install -o -f redis \ - && rm -rf /tmp/pear \ - && docker-php-ext-enable redis \ - \ && apt-get purge -y --auto-remove $PHPIZE_DEPS \ && apt-get purge -y --auto-remove libfreetype6-dev \ libicu-dev \ diff --git a/runtime/php/v8.2/composer.json b/runtime/php/v8.2/composer.json index 1058f13..5e175d2 100644 --- a/runtime/php/v8.2/composer.json +++ b/runtime/php/v8.2/composer.json @@ -7,6 +7,7 @@ "require": { "guzzlehttp/guzzle": "7.7.0", "ramsey/uuid": "4.7.4", - "openai-php/client": "v0.8.5" + "openai-php/client": "v0.8.5", + "league/flysystem": "^3.0" } } diff --git a/runtime/php/v8.3/Dockerfile b/runtime/php/v8.3/Dockerfile index 0bcb39f..3c214db 100644 --- a/runtime/php/v8.3/Dockerfile +++ b/runtime/php/v8.3/Dockerfile @@ -20,6 +20,7 @@ ARG COMMON=missing:missing FROM ${COMMON} as builder FROM php:8.3-cli-bookworm +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ # install PHP extensions RUN apt-get -y update \ @@ -46,25 +47,20 @@ RUN apt-get -y update \ libzip-dev \ postgresql-server-dev-15 \ \ - && docker-php-ext-install \ + && install-php-extensions \ bcmath \ gd \ intl \ mysqli \ + mongodb \ opcache \ + pgsql \ pdo_mysql \ pdo_pgsql \ + redis \ soap \ zip \ \ - && mkdir -p /usr/src/php/ext/mongodb \ - && curl -fsSL https://pecl.php.net/get/mongodb-1.14.0 | tar xvz -C "/usr/src/php/ext/mongodb" --strip 1 \ - && docker-php-ext-install -j$(nproc) mongodb \ - \ - && pecl install -o -f redis \ - && rm -rf /tmp/pear \ - && docker-php-ext-enable redis \ - \ && apt-get purge -y --auto-remove $PHPIZE_DEPS \ && apt-get purge -y --auto-remove libfreetype6-dev \ libicu-dev \ diff --git a/runtime/php/v8.3/composer.json b/runtime/php/v8.3/composer.json index 8c14855..c45de4e 100644 --- a/runtime/php/v8.3/composer.json +++ b/runtime/php/v8.3/composer.json @@ -7,6 +7,7 @@ "require": { "guzzlehttp/guzzle": "7.8.1", "ramsey/uuid": "4.7.5", - "openai-php/client": "v0.8.5" + "openai-php/client": "v0.8.5", + "league/flysystem": "^3.0" } } \ No newline at end of file