Skip to content

Commit 1e3d8e1

Browse files
yansongdayansongda
committed
update
1 parent f61c096 commit 1e3d8e1

File tree

12 files changed

+80
-122
lines changed

12 files changed

+80
-122
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
php-version:
28-
- '8.5'
28+
# - '8.5'
2929
- '8.4'
3030
- '8.3'
3131
- '8.2'
32+
- '8.1'
3233
php-mode:
3334
- cli
3435
system:
@@ -83,10 +84,11 @@ jobs:
8384
fail-fast: false
8485
matrix:
8586
php-version:
86-
- '8.5'
87+
# - '8.5'
8788
- '8.4'
8889
- '8.3'
8990
- '8.2'
91+
- '8.1'
9092
php-mode:
9193
- cli
9294
system:

‎8.1/cli/alpine/Dockerfile‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.1-cli-alpine
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev
8-
ENV BUILD_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="$PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev"
8+
ENV BUILD_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
libpng-dev libzip-dev freetype-dev \
13-
libwebp-dev libjpeg-turbo-dev libxpm-dev \
14-
bzip2-dev libstdc++
15-
ENV PHP_EXT_PECL_INSTALL \
16-
redis-6.2.0 xlswriter-1.5.7
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.1
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="libpng-dev libzip-dev freetype-dev libwebp-dev libjpeg-turbo-dev libxpm-dev bzip2-dev libstdc++"
12+
ENV PHP_EXT_PECL_INSTALL="redis-6.2.0 xlswriter-1.5.7"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.1"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apk add -U --no-cache --virtual .build-deps $DEPENDENCIES \

‎8.1/cli/bookworm/sources.list‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

8.1/cli/bookworm/Dockerfile renamed to 8.1/cli/trixie/Dockerfile

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
FROM php:8.1-cli-bookworm
1+
FROM php:8.1-cli-trixie
22

33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES gnupg git gcc g++
8-
ENV WORKING_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="gnupg git gcc g++"
8+
ENV WORKING_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
curl wget unzip ca-certificates libcurl4-openssl-dev \
13-
libwebp-dev libbz2-dev libpng-dev libxpm-dev \
14-
libfreetype6-dev libjpeg-dev libssh-dev libzip-dev
15-
ENV PHP_EXT_INSTALLED_PECL \
16-
redis-6.2.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.1
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="curl wget unzip ca-certificates libcurl4-openssl-dev libwebp-dev libbz2-dev libpng-dev libxpm-dev libfreetype6-dev libjpeg-dev libssh-dev libzip-dev"
12+
ENV PHP_EXT_INSTALLED_PECL="redis-6.2.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.1"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apt-get update \
@@ -46,10 +42,10 @@ RUN apt-get update \
4642
&& rm -rf /var/lib/apt/lists/* /tmp/pear ~/.pearrc && cd $WORKING_DIR && cd .. && rm -rf $WORKING_DIR \
4743
# For me
4844
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
45+
&& sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
4946
&& php --ri swoole && php --ri xlswriter
5047

5148
# After Build
5249
WORKDIR /www
5350

54-
COPY ./bookworm/sources.list /etc/apt/sources.list
5551
COPY php.ini /usr/local/etc/php/

‎8.2/cli/alpine/Dockerfile‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.2-cli-alpine
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev
8-
ENV BUILD_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="$PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev"
8+
ENV BUILD_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
libpng-dev libzip-dev freetype-dev \
13-
libwebp-dev libjpeg-turbo-dev libxpm-dev \
14-
bzip2-dev libstdc++ linux-headers
15-
ENV PHP_EXT_PECL_INSTALL \
16-
redis-6.3.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.4
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="libpng-dev libzip-dev freetype-dev libwebp-dev libjpeg-turbo-dev libxpm-dev bzip2-dev libstdc++ linux-headers"
12+
ENV PHP_EXT_PECL_INSTALL="redis-6.3.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.4"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apk add -U --no-cache --virtual .build-deps $DEPENDENCIES \

‎8.2/cli/trixie/Dockerfile‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.2-cli-trixie
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES gnupg git gcc g++
8-
ENV WORKING_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="gnupg git gcc g++"
8+
ENV WORKING_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
curl wget unzip ca-certificates libcurl4-openssl-dev \
13-
libwebp-dev libbz2-dev libpng-dev libxpm-dev \
14-
libfreetype6-dev libjpeg-dev libssh-dev libzip-dev
15-
ENV PHP_EXT_INSTALLED_PECL \
16-
redis-6.3.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.4
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="curl wget unzip ca-certificates libcurl4-openssl-dev libwebp-dev libbz2-dev libpng-dev libxpm-dev libfreetype6-dev libjpeg-dev libssh-dev libzip-dev"
12+
ENV PHP_EXT_INSTALLED_PECL="redis-6.3.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.4"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apt-get update \
@@ -46,7 +42,7 @@ RUN apt-get update \
4642
&& rm -rf /var/lib/apt/lists/* /tmp/pear ~/.pearrc && cd $WORKING_DIR && cd .. && rm -rf $WORKING_DIR \
4743
# For me
4844
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
49-
&& sudo sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
45+
&& sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
5046
&& php --ri swoole && php --ri xlswriter
5147

5248
# After Build

‎8.3/cli/alpine/Dockerfile‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.3-cli-alpine
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev
8-
ENV BUILD_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="$PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev"
8+
ENV BUILD_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
libpng-dev libzip-dev freetype-dev \
13-
libwebp-dev libjpeg-turbo-dev libxpm-dev \
14-
bzip2-dev libstdc++ linux-headers
15-
ENV PHP_EXT_PECL_INSTALL \
16-
redis-6.3.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.4
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="libpng-dev libzip-dev freetype-dev libwebp-dev libjpeg-turbo-dev libxpm-dev bzip2-dev libstdc++ linux-headers"
12+
ENV PHP_EXT_PECL_INSTALL="redis-6.3.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.4"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apk add -U --no-cache --virtual .build-deps $DEPENDENCIES \

‎8.3/cli/trixie/Dockerfile‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.3-cli-trixie
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES gnupg git gcc g++
8-
ENV WORKING_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="gnupg git gcc g++"
8+
ENV WORKING_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
curl wget unzip ca-certificates libcurl4-openssl-dev \
13-
libwebp-dev libbz2-dev libpng-dev libxpm-dev libc-ares-dev \
14-
libfreetype6-dev libjpeg-dev libssh-dev libzip-dev
15-
ENV PHP_EXT_INSTALLED_PECL \
16-
redis-6.3.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.4
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="curl wget unzip ca-certificates libcurl4-openssl-dev libwebp-dev libbz2-dev libpng-dev libxpm-dev libc-ares-dev libfreetype6-dev libjpeg-dev libssh-dev libzip-dev"
12+
ENV PHP_EXT_INSTALLED_PECL="redis-6.3.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.4"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apt-get update \
@@ -46,7 +42,7 @@ RUN apt-get update \
4642
&& rm -rf /var/lib/apt/lists/* /tmp/pear ~/.pearrc && cd $WORKING_DIR && cd .. && rm -rf $WORKING_DIR \
4743
# For me
4844
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
49-
&& sudo sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
45+
&& sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
5046
&& php --ri swoole && php --ri xlswriter
5147

5248
# After Build

‎8.4/cli/alpine/Dockerfile‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.4-cli-alpine
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev
8-
ENV BUILD_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="$PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev"
8+
ENV BUILD_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
libpng-dev libzip-dev freetype-dev \
13-
libwebp-dev libjpeg-turbo-dev libxpm-dev \
14-
bzip2-dev libstdc++ linux-headers
15-
ENV PHP_EXT_PECL_INSTALL \
16-
redis-6.3.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.4
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="libpng-dev libzip-dev freetype-dev libwebp-dev libjpeg-turbo-dev libxpm-dev bzip2-dev libstdc++ linux-headers"
12+
ENV PHP_EXT_PECL_INSTALL="redis-6.3.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.4"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apk add -U --no-cache --virtual .build-deps $DEPENDENCIES \

‎8.4/cli/trixie/Dockerfile‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ FROM php:8.4-cli-trixie
33
LABEL maintainer="yansongda <me@yansongda.cn>"
44

55
# ENV for Global
6-
ENV TZ=Asia/Shanghai
7-
ENV DEPENDENCIES gnupg git gcc g++
8-
ENV WORKING_DIR /tmp
6+
ENV TZ="Asia/Shanghai"
7+
ENV DEPENDENCIES="gnupg git gcc g++"
8+
ENV WORKING_DIR="/tmp"
99

1010
# ENV for PHP
11-
ENV PHP_DEPENDENCIES \
12-
curl wget unzip ca-certificates libcurl4-openssl-dev \
13-
libwebp-dev libbz2-dev libpng-dev libxpm-dev libc-ares-dev \
14-
libfreetype6-dev libjpeg-dev libssh-dev libzip-dev
15-
ENV PHP_EXT_INSTALLED_PECL \
16-
redis-6.3.0 xlswriter-1.5.8
17-
ENV PHP_EXT_SWOOLE_VERSION 6.1.4
18-
ENV PHP_COMPOSER_URL https://getcomposer.org/composer-stable.phar
11+
ENV PHP_DEPENDENCIES="curl wget unzip ca-certificates libcurl4-openssl-dev libwebp-dev libbz2-dev libpng-dev libxpm-dev libc-ares-dev libfreetype6-dev libjpeg-dev libssh-dev libzip-dev"
12+
ENV PHP_EXT_INSTALLED_PECL="redis-6.3.0 xlswriter-1.5.8"
13+
ENV PHP_EXT_SWOOLE_VERSION="6.1.4"
14+
ENV PHP_COMPOSER_URL="https://getcomposer.org/composer-stable.phar"
1915

2016
# Prepare
2117
RUN apt-get update \
@@ -46,7 +42,7 @@ RUN apt-get update \
4642
&& rm -rf /var/lib/apt/lists/* /tmp/pear ~/.pearrc && cd $WORKING_DIR && cd .. && rm -rf $WORKING_DIR \
4743
# For me
4844
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
49-
&& sudo sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
45+
&& sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
5046
&& php --ri swoole && php --ri xlswriter
5147

5248
# After Build

0 commit comments

Comments
 (0)