Removed pdo_sqlite from base images.

hyperf · Dec 18, 2023 · 0941cab · 0941cab
1 parent 10061ea
commit 0941cab
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 247 deletions.
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -2,7 +2,7 @@ name: Build Develop
 
 on: [ push ]
 env:
-  COMPOSER_VERSION: '2.6.5'
+  COMPOSER_VERSION: '2.6.6'
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 jobs:
   build:

diff --git a/.github/workflows/build-swoole.yml b/.github/workflows/build-swoole.yml
@@ -4,7 +4,7 @@ on: [ push ]
 env:
   ENGINE: 'swoole'
   SW_VERSION: 'v5.1.1'
-  COMPOSER_VERSION: '2.6.5'
+  COMPOSER_VERSION: '2.6.6'
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
 jobs:

diff --git a/.github/workflows/build-swow.yml b/.github/workflows/build-swow.yml
@@ -3,8 +3,8 @@ name: Build Swow
 on: [ push ]
 env:
   ENGINE: 'swow'
-  SW_VERSION: 'v1.3.1'
-  COMPOSER_VERSION: '2.6.5'
+  SW_VERSION: 'v1.4.1'
+  COMPOSER_VERSION: '2.6.6'
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
 jobs:

diff --git a/8.0/alpine/base/Dockerfile b/8.0/alpine/base/Dockerfile
diff --git a/8.0/alpine/dev/Dockerfile b/8.0/alpine/dev/Dockerfile
diff --git a/8.0/alpine/swoole/Dockerfile b/8.0/alpine/swoole/Dockerfile
diff --git a/8.0/alpine/swow/Dockerfile b/8.0/alpine/swow/Dockerfile
diff --git a/8.1/alpine/base/Dockerfile b/8.1/alpine/base/Dockerfile
@@ -40,7 +40,6 @@ RUN set -ex \
     php81-openssl \
     php81-pdo \
     php81-pdo_mysql \
-    php81-pdo_sqlite \
     php81-phar \
     php81-posix \
     php81-redis \

diff --git a/8.1/alpine/dev/Dockerfile b/8.1/alpine/dev/Dockerfile
@@ -14,7 +14,7 @@ LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MI
 ARG COMPOSER_VERSION
 ARG PHP_BUILD_VERSION
 
-ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
+ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
     COMPOSER_ALLOW_SUPERUSER=1
 
 ##

diff --git a/8.1/alpine/swoole/Dockerfile b/8.1/alpine/swoole/Dockerfile
@@ -18,8 +18,8 @@ ARG PHP_BUILD_VERSION
 ##
 # ---------- env settings ----------
 ##
-ENV SW_VERSION=${SW_VERSION:-"v5.0.0"} \
-    COMPOSER_VERSION=${COMPOSER_VERSION:-"2.3.10"} \
+ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
+    COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
     COMPOSER_ALLOW_SUPERUSER=1 \
     #  install and remove building packages
     PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake libaio-dev openssl-dev curl-dev"

diff --git a/8.2/alpine/base/Dockerfile b/8.2/alpine/base/Dockerfile
@@ -40,7 +40,6 @@ RUN set -ex \
     php82-openssl \
     php82-pdo \
     php82-pdo_mysql \
-    php82-pdo_sqlite \
     php82-phar \
     php82-posix \
     php82-redis \

diff --git a/8.2/alpine/dev/Dockerfile b/8.2/alpine/dev/Dockerfile
@@ -14,7 +14,7 @@ LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MI
 ARG COMPOSER_VERSION
 ARG PHP_BUILD_VERSION
 
-ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
+ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
     COMPOSER_ALLOW_SUPERUSER=1
 
 ##

diff --git a/8.2/alpine/swoole/Dockerfile b/8.2/alpine/swoole/Dockerfile
@@ -18,8 +18,8 @@ ARG PHP_BUILD_VERSION
 ##
 # ---------- env settings ----------
 ##
-ENV SW_VERSION=${SW_VERSION:-"v5.0.0"} \
-    COMPOSER_VERSION=${COMPOSER_VERSION:-"2.3.10"} \
+ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
+    COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
     COMPOSER_ALLOW_SUPERUSER=1 \
     #  install and remove building packages
     PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake libaio-dev openssl-dev curl-dev"

diff --git a/8.3/alpine/base/Dockerfile b/8.3/alpine/base/Dockerfile
@@ -40,7 +40,6 @@ RUN set -ex \
     php83-openssl \
     php83-pdo \
     php83-pdo_mysql \
-    php83-pdo_sqlite \
     php83-phar \
     php83-posix \
     php83-redis \

diff --git a/8.3/alpine/dev/Dockerfile b/8.3/alpine/dev/Dockerfile
@@ -14,7 +14,7 @@ LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MI
 ARG COMPOSER_VERSION
 ARG PHP_BUILD_VERSION
 
-ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
+ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
     COMPOSER_ALLOW_SUPERUSER=1
 
 ##

diff --git a/8.3/alpine/swoole/Dockerfile b/8.3/alpine/swoole/Dockerfile
@@ -18,8 +18,8 @@ ARG PHP_BUILD_VERSION
 ##
 # ---------- env settings ----------
 ##
-ENV SW_VERSION=${SW_VERSION:-"v5.0.0"} \
-    COMPOSER_VERSION=${COMPOSER_VERSION:-"2.3.10"} \
+ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
+    COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
     COMPOSER_ALLOW_SUPERUSER=1 \
     #  install and remove building packages
     PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake libaio-dev openssl-dev curl-dev"