Skip to content

Commit

Permalink
Sync from khs1994-docker/lnmp@5505520 by PCIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@khs1994
khs1994 committed Feb 11, 2024
1 parent 462c98e commit cfb52f1
Show file tree
Hide file tree
Showing 28 changed files with 85 additions and 73 deletions.
4 changes: 2 additions & 2 deletions .env.example
View file
Original file line number Diff line number Diff line change
@@ -1,8 1,8 @@
DOCKER_HUB_USERNAME=khs1994

PHP_VERSION_83=8.3.0
PHP_VERSION_82=8.2.10
PHP_VERSION_81=8.1.23
PHP_VERSION_82=8.2.13
PHP_VERSION_81=8.1.26
PHP_VERSION_80=8.0.30
# EOL
PHP_VERSION_74=7.4.33
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php_8_1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@ on:
PHP_VERSION:
description: php version
required: true
default: "8.1.23"
default: "8.1.26"

name: PHP_8.1

Expand Down Expand Up @@ -194,7 194,7 @@ jobs:
PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7
PHP_VERSION: 8_1_X
FOLDER: "8.1"
PHP_TAG_VERSION: "8.1.23"
PHP_TAG_VERSION: "8.1.26"
TYPE: ${{ matrix.TYPE }}
add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php
name: 'Build Image'
4 changes: 2 additions & 2 deletions .github/workflows/php_8_2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@ on:
PHP_VERSION:
description: php version
required: true
default: "8.2.10"
default: "8.2.13"

name: PHP_8.2

Expand Down Expand Up @@ -194,7 194,7 @@ jobs:
PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7
PHP_VERSION: 8_2_X
FOLDER: "8.2"
PHP_TAG_VERSION: "8.2.10"
PHP_TAG_VERSION: "8.2.13"
TYPE: ${{ matrix.TYPE }}
add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php
name: 'Build Image'
4 changes: 2 additions & 2 deletions .github/workflows/php_zz_tool.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@ on:
PHP_VERSION:
description: php version
required: true
default: "8.1.23"
default: "8.1.26"

name: PHP_TOOL

Expand Down Expand Up @@ -180,7 180,7 @@ jobs:
PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7
PHP_VERSION: 8_1_X
FOLDER: "8.1"
PHP_TAG_VERSION: "8.1.23"
PHP_TAG_VERSION: "8.1.26"
TYPE: ${{ matrix.TYPE }}
add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php pcit-docker.pkg.coding.net/khs1994-docker/khs1994/php ghcr.io/khs1994/php
name: 'Build Image'
1 change: 1 addition & 0 deletions 8.0/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 205,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \
&& export CFLAGS="$PHP_CFLAGS" \
CPPFLAGS="$PHP_CPPFLAGS" \
LDFLAGS="$PHP_LDFLAGS" \
PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \
&& docker-php-source extract \
&& cd /usr/src/php \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down
7 changes: 4 additions & 3 deletions 8.1/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,16 1,16 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26

FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream

FROM --platform=$TARGETPLATFORM alpine:3.17
FROM --platform=$TARGETPLATFORM alpine:3.19

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

ENV TZ=Asia/Shanghai \
APP_ENV=development

ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26

ARG ALPINE_URL=dl-cdn.alpinelinux.org

Expand Down Expand Up @@ -205,6 205,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \
&& export CFLAGS="$PHP_CFLAGS" \
CPPFLAGS="$PHP_CPPFLAGS" \
LDFLAGS="$PHP_LDFLAGS" \
PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \
&& docker-php-source extract \
&& cd /usr/src/php \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down
2 changes: 1 addition & 1 deletion 8.1/composer/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26
ARG USERNAME=khs1994
# ARG BASE=fpm
ARG BASE=cli
Expand Down
4 changes: 2 additions & 2 deletions 8.1/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26

FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php
FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

Expand Down
2 changes: 1 addition & 1 deletion 8.1/s6/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 1,6 @@
# syntax=docker/dockerfile:labs

ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26
ARG USERNAME=khs1994
ARG BASE=fpm

Expand Down
4 changes: 2 additions & 2 deletions 8.1/swoole/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26
ARG USERNAME=khs1994
ARG BASE=cli

Expand Down Expand Up @@ -27,7 27,7 @@ ENV SWOOLE_VERSION=v5.0.3

ARG ALPINE_URL=dl-cdn.alpinelinux.org

RUN --mount=type=bind,from=php:8.1.23-alpine,source=/usr/local/bin,target=/opt/bin,rw \
RUN --mount=type=bind,from=php:8.1.26-alpine,source=/usr/local/bin,target=/opt/bin,rw \
set -x \
&& sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \
&& apk add --no-cache --virtual .pecl_build_deps \
Expand Down
2 changes: 1 addition & 1 deletion 8.1/unit/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26
ARG USERNAME=khs1994
ARG BASE=cli

Expand Down
7 changes: 4 additions & 3 deletions 8.2/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,16 1,16 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13

FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream

FROM --platform=$TARGETPLATFORM alpine:3.17
FROM --platform=$TARGETPLATFORM alpine:3.19

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

ENV TZ=Asia/Shanghai \
APP_ENV=development

ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13

ARG ALPINE_URL=dl-cdn.alpinelinux.org

Expand Down Expand Up @@ -204,6 204,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \
&& export CFLAGS="$PHP_CFLAGS" \
CPPFLAGS="$PHP_CPPFLAGS" \
LDFLAGS="$PHP_LDFLAGS" \
PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \
&& docker-php-source extract \
&& cd /usr/src/php \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down
2 changes: 1 addition & 1 deletion 8.2/composer/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13
ARG USERNAME=khs1994
# ARG BASE=fpm
ARG BASE=cli
Expand Down
4 changes: 2 additions & 2 deletions 8.2/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13

FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.17 as php
FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

Expand Down
2 changes: 1 addition & 1 deletion 8.2/s6/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 1,6 @@
# syntax=docker/dockerfile:labs

ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13
ARG USERNAME=khs1994
ARG BASE=fpm

Expand Down
4 changes: 2 additions & 2 deletions 8.2/swoole/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13
ARG USERNAME=khs1994
ARG BASE=cli

Expand Down Expand Up @@ -27,7 27,7 @@ ENV SWOOLE_VERSION=v5.0.3

ARG ALPINE_URL=dl-cdn.alpinelinux.org

RUN --mount=type=bind,from=php:8.2.10-alpine,source=/usr/local/bin,target=/opt/bin,rw \
RUN --mount=type=bind,from=php:8.2.13-alpine,source=/usr/local/bin,target=/opt/bin,rw \
set -x \
&& sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_URL}/g" /etc/apk/repositories \
&& apk add --no-cache --virtual .pecl_build_deps \
Expand Down
2 changes: 1 addition & 1 deletion 8.2/unit/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.2.10
ARG PHP_VERSION=8.2.13
ARG USERNAME=khs1994
ARG BASE=cli

Expand Down
3 changes: 2 additions & 1 deletion 8.3/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 3,7 @@ ARG PHP_VERSION=8.3.0

FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-alpine as upstream

FROM --platform=$TARGETPLATFORM alpine:3.18
FROM --platform=$TARGETPLATFORM alpine:3.19

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

Expand Down Expand Up @@ -204,6 204,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/src,target=/usr/local/src,rw \
&& export CFLAGS="$PHP_CFLAGS" \
CPPFLAGS="$PHP_CPPFLAGS" \
LDFLAGS="$PHP_LDFLAGS" \
PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \
&& docker-php-source extract \
&& cd /usr/src/php \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down
2 changes: 1 addition & 1 deletion 8.3/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
# syntax=docker/dockerfile:labs
ARG PHP_VERSION=8.3.0

FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.18 as php
FROM --platform=$TARGETPLATFORM php:${PHP_VERSION}-fpm-alpine3.19 as php

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,7 @@

## 8.4

## Remove ext/imap — it has been moved to PECL
### Remove ext/imap — it has been moved to PECL

* https://hub.nuaa.cf/php/php-src/commit/f62f6a6d4b9567530775d684db55e9990952c737
* https://hub.nuaa.cf/php/php-src/commits/master/ext/imap
Expand All @@ -16,3 16,9 @@

* https://hub.nuaa.cf/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1
* https://hub.nuaa.cf/php/php-src/commits/master/ext/pspell

## docker image ftp ext removed

* 8.3.2(removed)
* 8.2.15(removed)
* 8.1.28(removed)
26 changes: 13 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 14,28 @@

## 后缀

* 8.2.10-cli-alpine
* 8.2.10-fpm-alpine
* 8.2.10-unit-alpine (based cli)
* 8.2.10-composer-alpine (based fpm)
* 8.2.10-swoole-alpine (based cli)
* 8.2.10-s6-alpine (based fpm)
* 8.2.13-cli-alpine
* 8.2.13-fpm-alpine
* 8.2.13-unit-alpine (based cli)
* 8.2.13-composer-alpine (based fpm)
* 8.2.13-swoole-alpine (based cli)
* 8.2.13-s6-alpine (based fpm)

## Supported tags and respective `Dockerfile` links

* [`8.2.10-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.2/fpm/Dockerfile)
* [`8.2.13-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.2/fpm/Dockerfile)

* [`8.1.23-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.1/fpm/Dockerfile)
* [`8.1.26-fpm-alpine` (8.1/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.1/fpm/Dockerfile)

* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/8.0/fpm/Dockerfile)
* [`8.0.30-fpm-alpine` (8.0/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/8.0/fpm/Dockerfile)

* [`nightly-fpm-alpine` (nightly/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/master/nightly/fpm/Dockerfile)

* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.4/fpm/Dockerfile)
* [`7.4.33-fpm-alpine` (7.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.4/fpm/Dockerfile)

* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.3/fpm/Dockerfile)
* [`7.3.33-fpm-alpine` (7.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.3/fpm/Dockerfile)

* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.10/7.2/fpm/Dockerfile)
* [`7.2.34-fpm-alpine` (7.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.2.13/7.2/fpm/Dockerfile)

## Overview

Expand Down Expand Up @@ -168,7 168,7 @@ $ for ext in `ls /usr/src/php/ext`; do echo '*' $( php -r "if(extension_loaded('

* https://sources.debian.org/src/php7.4/7.4.33-1 deb11u1/debian/control/

* https://sources.debian.org/src/php8.1/8.2.10-1/debian/control/
* https://sources.debian.org/src/php8.1/8.2.13-1/debian/control/

* https://ram.tianon.xyz/post/2017/12/26/dockerize-compiled-software.html

Expand Down
3 changes: 2 additions & 1 deletion nightly/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
FROM --platform=$TARGETPLATFORM alpine:3.18
FROM --platform=$TARGETPLATFORM alpine:3.19

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

Expand Down Expand Up @@ -239,6 239,7 @@ RUN --mount=type=bind,from=php:alpine,source=/usr/local/bin,target=/opt/bin,rw \
&& export CFLAGS="$PHP_CFLAGS" \
CPPFLAGS="$PHP_CPPFLAGS" \
LDFLAGS="$PHP_LDFLAGS" \
PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \
ARGON2_LIBS="-largon2" \
ARGON2_CFLAGS="-I/usr/include" \
# && docker-php-source extract \
Expand Down
3 changes: 2 additions & 1 deletion nightly/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
# syntax=docker/dockerfile:labs
FROM --platform=$TARGETPLATFORM alpine:3.18 as php
FROM --platform=$TARGETPLATFORM alpine:3.19 as php

LABEL maintainer="khs1994-docker/lnmp <[email protected]>"

Expand Down Expand Up @@ -224,6 224,7 @@ RUN --mount=type=bind,from=php:fpm-alpine,source=/usr/local/bin,target=/opt/bin,
&& export CFLAGS="$PHP_CFLAGS" \
CPPFLAGS="$PHP_CPPFLAGS" \
LDFLAGS="$PHP_LDFLAGS" \
PHP_BUILD_PROVIDER='https://github.com/khs1994-docker/php' \
ARGON2_LIBS="-largon2" \
ARGON2_CFLAGS="-I/usr/include" \
# && docker-php-source extract \
Expand Down
2 changes: 1 addition & 1 deletion php-cs-fixer/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 1,6 @@
# syntax=docker/dockerfile:labs

ARG PHP_VERSION=8.1.23
ARG PHP_VERSION=8.1.26
ARG USERNAME=khs1994
ARG BASE=composer

Expand Down
2 changes: 1 addition & 1 deletion phploc/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 4,7 @@ ARG PHP_VERSION=7.4.33
ARG USERNAME=khs1994
ARG BASE=composer

FROM alpine:3.17 as phploc-downloader
FROM alpine:3.19 as phploc-downloader

# Copy/Paste Detector (CPD) for PHP code. https://github.com/sebastianbergmann/phploc

Expand Down
Loading

0 comments on commit cfb52f1

Please sign in to comment.