Skip to content

Commit 57fbf80

Browse files
committed
Mettre à jour le lien de documentation dans le script d'entrée du conteneur
1 parent fe7b70c commit 57fbf80

5 files changed

Lines changed: 82 additions & 2 deletions

File tree

.github/workflows/action_publish-images-dev-main.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,15 @@ jobs:
1010
registry-repositories: "ghcr.io/yieldstudio/php-dev" # Set to our development repository
1111
tag-prefix: ''
1212
release-type: latest
13+
secrets: inherit
14+
15+
build-sail-images:
16+
needs: build-dev-images
17+
uses: ./.github/workflows/service_docker-build-and-publish.yml
18+
with:
19+
registry-repositories: "ghcr.io/yieldstudio/sail-dev" # Set to our development repository
20+
tag-prefix: ''
21+
php-versions-config: 'scripts/conf/sail-versions-base-config.yml'
22+
php-versions-file: 'scripts/conf/sail-versions.yml'
23+
release-type: latest
1324
secrets: inherit

.github/workflows/service_docker-build-and-publish.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
required: true
1616
type: string
1717
description: 'The prefix to use for the Docker image tags.'
18+
php-versions-config:
19+
type: string
20+
default: 'scripts/conf/php-versions-base-config.yml'
21+
description: 'The path to the PHP versions file.'
1822
php-versions-file:
1923
type: string
2024
default: 'scripts/conf/php-versions.yml'
@@ -50,7 +54,7 @@ jobs:
5054
- name: Prepare PHP versions for the matrix. 😎
5155
run: |
5256
chmod +x ./scripts/get-php-versions.sh
53-
./scripts/get-php-versions.sh
57+
./scripts/get-php-versions.sh --input ${{ inputs.php-versions-config }} --output ${{ inputs.php-versions-file }}
5458
env:
5559
SKIP_DOWNLOAD: false
5660

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
php_variations:
2+
- name: sail
3+
default: true
4+
5+
php_versions:
6+
- major: "8"
7+
minor_versions:
8+
- minor: "8.3"
9+
base_os:
10+
- name: bookworm
11+
- name: trixie
12+
patch_versions:
13+
# - 8.3.6 # Pull latest from Official PHP source
14+
- minor: "8.4"
15+
base_os:
16+
- name: bookworm
17+
- name: trixie
18+
patch_versions:
19+
# - 8.4.1 # Pull latest from Official PHP source
20+
# PHP 8.5-rc has a blocking bug in a dependency that is not yet fixed.
21+
#
22+
# - minor: "8.5-rc"
23+
# base_os:
24+
# - name: bookworm
25+
# - name: trixie
26+
# patch_versions:
27+
# - 8.5-rc
28+
29+
operating_systems:
30+
- family: alpine
31+
versions:
32+
- name: "Alpine 3.16"
33+
version: alpine3.16
34+
number: 3.16
35+
- name: "Alpine 3.17"
36+
version: alpine3.17
37+
number: 3.17
38+
- name: "Alpine 3.18"
39+
version: alpine3.18
40+
number: 3.18
41+
- name: "Alpine 3.19"
42+
version: alpine3.19
43+
number: 3.19
44+
- name: "Alpine 3.20"
45+
version: alpine3.20
46+
number: 3.20
47+
- name: "Alpine 3.21"
48+
version: alpine3.21
49+
number: 3.21
50+
- name: "Alpine 3.22"
51+
version: alpine3.22
52+
number: 3.22
53+
- family: debian
54+
default: true
55+
versions:
56+
- name: "Debian Bullseye"
57+
version: bullseye
58+
number: 11
59+
- name: "Debian Bookworm"
60+
version: bookworm
61+
number: 12
62+
- name: "Debian Trixie"
63+
version: trixie
64+
number: 13

src/common/etc/entrypoint.d/0-container-info.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ echo '
2828
▐▌ ▗▄█▄▖▐▙▄▄▖▐▙▄▄▖▐▙▄▄▀ ▝▚▄▞▘▐▌ ▐▌▝▚▄▞▘▝▚▄▞▘▐▌ ▐▙▄▄▖
2929
--------------------------------------------------------------
3030
31-
📚 Documentation: https://serversideup.net/php/docs
31+
📚 Documentation: https://yieldstudio.github.io/docker-php/
3232
3333
-------------------------------------
3434
ℹ️ Container Information

src/variations/frankenphp/etc/frankenphp/Caddyfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
# Trust Docker/private networks + loopback + Cloudflare ranges
2323
trusted_proxies static \
2424
10.0.0.0/8 \
25+
100.64.0.0/16 \
2526
172.16.0.0/12 \
2627
192.168.0.0/16 \
2728
127.0.0.1/8 \

0 commit comments

Comments
 (0)