Skip to content

Commit 8592f14

Browse files
kwatsonkwatson
committed
reorganization
1 parent 831bcdb commit 8592f14

File tree

188 files changed

+224
-3458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+224
-3458
lines changed

‎.github/workflows/litespeed-8.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: "Litespeed 8"
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '35 23 * * 2'
7+
8+
env:
9+
# The default repo env will be 'ComputeStacks'; uppercase is not allowed.
10+
GH_REPO: computestacks/cs-docker-php
11+
12+
jobs:
13+
build:
14+
strategy:
15+
matrix:
16+
php_version: [ "8.0", "8.1", "8.2" ]
17+
image: [ "ghcr.io/computestacks/cs-docker-php", "cmptstks/php" ]
18+
runs-on: ubuntu-latest
19+
permissions:
20+
contents: read
21+
packages: write
22+
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@v4
26+
27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v3
29+
30+
- name: Log into Github Registry
31+
if: github.event_name != 'pull_request'
32+
uses: docker/login-action@v3
33+
with:
34+
registry: ghcr.io
35+
username: ${{ github.actor }}
36+
password: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- name: Log into DockerHub
39+
if: github.event_name != 'pull_request'
40+
uses: docker/login-action@v3
41+
with:
42+
username: ${{ secrets.DOCKERHUB_USERNAME }}
43+
password: ${{ secrets.DOCKERHUB_TOKEN }}
44+
45+
- name: Extract metadata (tags, labels) for Docker
46+
id: meta
47+
uses: docker/metadata-action@v5
48+
with:
49+
images: images: ${{ matrix.image }}
50+
tags: |
51+
${{ matrix.php_version }}-litespeed
52+
53+
- name: Build and prepare to test
54+
uses: docker/build-push-action@v5
55+
with:
56+
context: litespeed/8/
57+
load: true
58+
build-args: |
59+
php_version=${{ matrix.php_version }}
60+
tags: ${{ steps.meta.outputs.tags }}
61+
labels: ${{ steps.meta.outputs.labels }}
62+
63+
- name: Test container image
64+
run: >
65+
docker run --rm --name=testphp${{ matrix.php_version }} -d \
66+
-e CS_AUTH_KEY=FcUpBTaoi746JbAdhWqJwtmXC0en1M3u -e METADATA_SERVICE=http://localhost \
67+
-e METADATA_AUTH=foobar123 ${{ matrix.image }}:${{ matrix.php_version }}-litespeed
68+
bash ./scripts/container-health.sh testphp${{ matrix.php_version }}
69+
70+
- name: Build and push
71+
id: build-and-push
72+
uses: docker/build-push-action@v5
73+
with:
74+
context: litespeed/8/
75+
push: ${{ github.event_name != 'pull_request' }}
76+
build-args: |
77+
php_version=${{ matrix.php_version }}
78+
tags: ${{ steps.meta.outputs.tags }}
79+
labels: ${{ steps.meta.outputs.labels }}
80+
cache-from: type=gha
81+
cache-to: type=gha,mode=max

‎.github/workflows/php8-nginx.yml‎ renamed to ‎.github/workflows/nginx.yml‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
name: "PHP 8 nginx"
1+
name: "PHP nginx"
22

33
on:
44
workflow_dispatch:
55
schedule:
66
- cron: '35 22 * * 2'
7-
# push:
8-
# branches: [ "main" ]
9-
# paths:
10-
# - "8-nginx/**"
11-
# pull_request:
12-
# branches: [ "main" ]
13-
# paths:
14-
# - "8-nginx/**"
157

168
env:
179
# The default repo env will be 'ComputeStacks'; uppercase is not allowed.
@@ -21,7 +13,8 @@ jobs:
2113
build:
2214
strategy:
2315
matrix:
24-
php_version: [ "8.0", "8.1", "8.2" ]
16+
php_version: [ "7.4", "8.0", "8.1", "8.2" ]
17+
image: [ "ghcr.io/computestacks/cs-docker-php", "cmptstks/php" ]
2518
runs-on: ubuntu-latest
2619
permissions:
2720
contents: read
@@ -56,31 +49,33 @@ jobs:
5649
id: meta
5750
uses: docker/metadata-action@v5
5851
with:
59-
images: ghcr.io/${{ env.GH_REPO }}
52+
images: images: ${{ matrix.image }}
6053
tags: |
6154
${{ matrix.php_version }}-nginx
6255
6356
6457
- name: Build and prepare to test
6558
uses: docker/build-push-action@v5
6659
with:
67-
context: 8-nginx/
60+
context: nginx/
6861
load: true
6962
build-args: |
7063
php_version=${{ matrix.php_version }}
7164
tags: ${{ steps.meta.outputs.tags }}
7265
labels: ${{ steps.meta.outputs.labels }}
7366

7467
- name: Test container image
75-
run: |
76-
docker run --rm --name=testphp${{ matrix.php_version }} -d -e CS_AUTH_KEY=FcUpBTaoi746JbAdhWqJwtmXC0en1M3u -e METADATA_SERVICE=http://localhost -e METADATA_AUTH=foobar123 ghcr.io/${{ env.GH_REPO }}:${{ matrix.php_version }}-nginx \
77-
&& bash ./scripts/container-health.sh testphp${{ matrix.php_version }}
68+
run: >
69+
docker run --rm --name=testphp${{ matrix.php_version }} -d \
70+
-e CS_AUTH_KEY=FcUpBTaoi746JbAdhWqJwtmXC0en1M3u -e METADATA_SERVICE=http://localhost \
71+
-e METADATA_AUTH=foobar123 ${{ matrix.image }}:${{ matrix.php_version }}-nginx
72+
bash ./scripts/container-health.sh testphp${{ matrix.php_version }}
7873
7974
- name: Build and push
8075
id: build-and-push
8176
uses: docker/build-push-action@v5
8277
with:
83-
context: 8-nginx/
78+
context: nginx/
8479
platforms: linux/amd64,linux/arm64
8580
push: ${{ github.event_name != 'pull_request' }}
8681
build-args: |

‎.github/workflows/php7-3.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
name: "PHP 7.3"
1+
name: "PHP 7.3 OLS"
22

33
on:
44
workflow_dispatch:
5-
push:
6-
branches: [ "main" ]
7-
paths:
8-
- "7.3-litespeed/**"
9-
pull_request:
10-
branches: [ "main" ]
11-
paths:
12-
- "7.3-litespeed/**"
135

146
env:
157
# The default repo env will be 'ComputeStacks'; uppercase is not allowed.

‎.github/workflows/php7-4-nginx.yml‎

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

‎.github/workflows/php7-4.yml‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,78 @@
1-
name: "PHP 7.4"
1+
name: "PHP 7.4 OLS"
22

33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '35 21 * * 2'
7-
push:
8-
branches: [ "main" ]
9-
paths:
10-
- "7.4-litespeed/**"
11-
pull_request:
12-
branches: [ "main" ]
13-
paths:
14-
- "7.4-litespeed/**"
6+
- cron: '35 20 * * 2'
157

168
env:
179
# The default repo env will be 'ComputeStacks'; uppercase is not allowed.
1810
GH_REPO: computestacks/cs-docker-php
1911

2012
jobs:
2113
build:
22-
14+
strategy:
15+
matrix:
16+
image: [ "ghcr.io/computestacks/cs-docker-php", "cmptstks/php" ]
2317
runs-on: ubuntu-latest
2418
permissions:
2519
contents: read
2620
packages: write
2721

2822
steps:
2923
- name: Checkout repository
30-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
3125

32-
- name: Setup Docker buildx
33-
uses: docker/setup-buildx-action@v2
26+
- name: Set up Docker Buildx
27+
uses: docker/setup-buildx-action@v3
3428

3529
- name: Log into Github Registry
3630
if: github.event_name != 'pull_request'
37-
uses: docker/login-action@v2
31+
uses: docker/login-action@v3
3832
with:
3933
registry: ghcr.io
4034
username: ${{ github.actor }}
4135
password: ${{ secrets.GITHUB_TOKEN }}
4236

4337
- name: Log into DockerHub
4438
if: github.event_name != 'pull_request'
45-
uses: docker/login-action@v2
39+
uses: docker/login-action@v3
4640
with:
4741
username: ${{ secrets.DOCKERHUB_USERNAME }}
4842
password: ${{ secrets.DOCKERHUB_TOKEN }}
4943

44+
- name: Extract metadata (tags, labels) for Docker
45+
id: meta
46+
uses: docker/metadata-action@v5
47+
with:
48+
images: images: ${{ matrix.image }}
49+
tags: |
50+
7.4-litespeed
51+
52+
- name: Build and prepare to test
53+
uses: docker/build-push-action@v5
54+
with:
55+
context: litespeed/7.4/
56+
load: true
57+
build-args: |
58+
php_version=${{ matrix.php_version }}
59+
tags: ${{ steps.meta.outputs.tags }}
60+
labels: ${{ steps.meta.outputs.labels }}
61+
62+
- name: Test container image
63+
run: >
64+
docker run --rm --name=testphp74 -d \
65+
-e CS_AUTH_KEY=FcUpBTaoi746JbAdhWqJwtmXC0en1M3u -e METADATA_SERVICE=http://localhost \
66+
-e METADATA_AUTH=foobar123 ${{ matrix.image }}:7.4-litespeed
67+
bash ./scripts/container-health.sh testphp74
68+
5069
- name: Build and push
5170
id: build-and-push
52-
uses: docker/build-push-action@v3
71+
uses: docker/build-push-action@v5
5372
with:
54-
context: 7.4-litespeed/
73+
context: litespeed/7.4/
5574
push: ${{ github.event_name != 'pull_request' }}
56-
tags: |
57-
cmptstks/php:7.4-litespeed
58-
ghcr.io/${{ env.GH_REPO }}:7.4-litespeed
75+
tags: ${{ steps.meta.outputs.tags }}
76+
labels: ${{ steps.meta.outputs.labels }}
5977
cache-from: type=gha
6078
cache-to: type=gha,mode=max

‎.github/workflows/php8-0.yml‎

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

0 commit comments

Comments
 (0)