update os version [2]

matyhtf · matyhtf · commit 7aa3bfb7f6d0 · 2023-05-16T20:11:57.000+08:00
diff --git a/7.2-alpine/Dockerfile b/7.2-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.2-alpine
+FROM php:7.2-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN  docker-php-ext-install \
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.2
+FROM php:7.2-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/7.3-alpine/Dockerfile b/7.3-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.3-alpine
+FROM php:7.3-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN  docker-php-ext-install \
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.3
+FROM php:7.3-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/7.4-alpine/Dockerfile b/7.4-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.4-alpine
+FROM php:7.4-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN  docker-php-ext-install \
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.4
+FROM php:7.4-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.0-alpine/Dockerfile b/8.0-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:8.0-alpine
+FROM php:8.0-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:8.0
+FROM php:8.0-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.1-alpine/Dockerfile b/8.1-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:8.1-alpine
+FROM php:8.1-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:8.1
+FROM php:8.1-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.2-alpine/Dockerfile b/8.2-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:8.2-alpine
+FROM php:8.2-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:8.2
+FROM php:8.2-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:alpine
+FROM php:alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/latest/Dockerfile b/latest/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:latest
+FROM php:latest-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/rc-alpine/Dockerfile b/rc-alpine/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:rc-alpine
+FROM php:rc-alpine3.18
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
@@ -40,8 +41,7 @@ RUN apk add --no-cache \
     libcurl \
     libpq \
     curl-dev \
-    unixodbc-dev \
-    odbc-mariadb
+    unixodbc-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/rc/Dockerfile b/rc/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:rc
+FROM php:rc-bullseye
+
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
