Skip to content

Commit d4f8c74

Browse files
jkanindajkaninda
authored
Merge pull request #81 from jkaninda/develop
Add add php 8.4 RC
2 parents 1733a63 + da5a209 commit d4f8c74

File tree

10 files changed

+86
-294
lines changed

10 files changed

+86
-294
lines changed

‎.github/workflows/build.yml

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,82 +3,104 @@ on:
33
push:
44
branches:
55
- master
6-
7-
env:
8-
BUILDKIT_IMAGE: jkaninda/laravel-php-fpm
96
jobs:
107
docker:
118
runs-on: ubuntu-latest
129
steps:
1310
-
1411
name: Set up QEMU
15-
uses: docker/setup-qemu-action@v3
12+
uses: docker/setup-qemu-action@v2
1613
-
1714
name: Set up Docker Buildx
18-
uses: docker/setup-buildx-action@v3
15+
uses: docker/setup-buildx-action@v2
1916
-
2017
name: Login to DockerHub
21-
uses: docker/login-action@v3
18+
uses: docker/login-action@v2
2219
with:
2320
username: ${{ secrets.DOCKERHUB_USERNAME }}
2421
password: ${{ secrets.DOCKERHUB_TOKEN }}
2522
-
26-
name: Build and push 8.0
23+
name: Build and push 8.1
2724
uses: docker/build-push-action@v3
2825
with:
29-
file: "./src/docker/8.0/Dockerfile"
26+
file: "./src/docker/Dockerfile"
3027
push: true
31-
tags: "${{env.BUILDKIT_IMAGE}}:8.0"
28+
platforms: linux/amd64,linux/arm64
29+
build-args: |
30+
phpVersion=8.1
31+
tags: "${{ vars.BUILDKIT_IMAGE }}:8.1"
3232
-
33-
name: Build and push 8.1
33+
name: Build and push 8.1 alpine
3434
uses: docker/build-push-action@v3
3535
with:
36-
file: "./src/docker/8.1/Dockerfile"
36+
file: "./src/docker/Dockerfile.alpine"
3737
push: true
3838
platforms: linux/amd64,linux/arm64
39-
tags: "${{env.BUILDKIT_IMAGE}}:8.1"
39+
build-args: |
40+
phpVersion=8.1
41+
tags: "${{ vars.BUILDKIT_IMAGE }}:8.1-alpine"
4042
-
4143
name: Build and push 8.2
4244
uses: docker/build-push-action@v3
4345
with:
44-
file: "./src/docker/8.2/Dockerfile"
46+
file: "./src/docker/Dockerfile"
4547
push: true
4648
platforms: linux/amd64,linux/arm64
47-
tags: "${{env.BUILDKIT_IMAGE}}:8.2"
49+
build-args: |
50+
phpVersion=8.2
51+
tags: "${{vars.BUILDKIT_IMAGE}}:8.2"
4852
-
49-
name: Build and push 8.1 alpine
53+
name: Build and push 8.2 alpine
5054
uses: docker/build-push-action@v3
5155
with:
52-
file: "./src/docker/8.1/Dockerfile.alpine"
56+
file: "./src/docker/Dockerfile.alpine"
5357
push: true
5458
platforms: linux/amd64,linux/arm64
55-
tags: |
56-
"${{env.BUILDKIT_IMAGE}}:8.1-alpine"
59+
build-args: |
60+
phpVersion=8.2
61+
tags: "${{vars.BUILDKIT_IMAGE}}:8.2-alpine"
5762
-
58-
name: Build and push 8.2 alpine
63+
name: Build and push 8.3
5964
uses: docker/build-push-action@v3
6065
with:
61-
file: "./src/docker/8.2/Dockerfile.alpine"
66+
file: "./src/docker/Dockerfile"
6267
push: true
6368
platforms: linux/amd64,linux/arm64
69+
build-args: |
70+
phpVersion=8.3
6471
tags: |
65-
"${{env.BUILDKIT_IMAGE}}:8.2-alpine"
72+
"${{vars.BUILDKIT_IMAGE}}:8.3"
73+
"${{vars.BUILDKIT_IMAGE}}:latest"
6674
-
6775
name: Build and push 8.3 alpine
6876
uses: docker/build-push-action@v3
6977
with:
70-
file: "./src/docker/8.3/Dockerfile.alpine"
78+
file: "./src/docker/Dockerfile.alpine"
7179
push: true
7280
platforms: linux/amd64,linux/arm64
81+
build-args: |
82+
phpVersion=8.3
7383
tags: |
74-
"${{env.BUILDKIT_IMAGE}}:8.3-alpine"
84+
"${{vars.BUILDKIT_IMAGE}}:8.3-alpine"
7585
-
76-
name: Build and push 8.3
86+
name: Build and push 8.4 RC
87+
uses: docker/build-push-action@v3
88+
with:
89+
file: "./src/docker/Dockerfile"
90+
push: true
91+
platforms: linux/amd64,linux/arm64
92+
build-args: |
93+
phpVersion=8.4.0RC4
94+
tags: |
95+
"${{vars.BUILDKIT_IMAGE}}:8.4.0RC4"
96+
-
97+
name: Build and push 8.4 RC alpine
7798
uses: docker/build-push-action@v3
7899
with:
79-
file: "./src/docker/8.3/Dockerfile"
100+
file: "./src/docker/Dockerfile.alpine"
80101
push: true
81102
platforms: linux/amd64,linux/arm64
103+
build-args: |
104+
phpVersion=8.4.0RC4
82105
tags: |
83-
"${{env.BUILDKIT_IMAGE}}:8.3"
84-
"${{env.BUILDKIT_IMAGE}}:latest"
106+
"${{vars.BUILDKIT_IMAGE}}:8.4.0RC4-alpine"

‎.github/workflows/integration-tests.yml renamed to ‎.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration Test
1+
name: Tests
22
on:
33
push:
44
jobs:

‎Makefile

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1-
IMAGE_NAME:jkaninda/laravel-php-fpm
2-
build-8.1:
3-
docker buildx build -f src/docker/8.1/Dockerfile -t ${IMAGE_NAME}:8.1 .
4-
build-8.2:
5-
docker buildx build -f src/docker/8.2/Dockerfile -t ${IMAGE_NAME}:8.2 .
6-
build-8.3:
7-
docker buildx build -f src/docker/8.3/Dockerfile -t ${IMAGE_NAME}:8.3 .
1+
IMAGE_NAME?=jkaninda/laravel-php-fpm
2+
.PHONY: all
3+
all: build
4+
##@ Build
5+
.PHONY: build
6+
build: build-81 build-82 build-83 build-84
7+
.PHONY: build-80
8+
build-80:
9+
docker build --build-arg phpVersion=8.0 -f src/docker/8.0/Dockerfile -t ${IMAGE_NAME}:8.0 .
10+
.PHONY: build-81
11+
build-81:
12+
docker build --build-arg phpVersion=8.1 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.1 .
13+
.PHONY: build-82
14+
build-82:
15+
docker build --build-arg phpVersion=8.2 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.2 .
16+
.PHONY: build-83
17+
build-83:
18+
docker build --build-arg phpVersion=8.3 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.3 .
19+
.PHONY: build-84
20+
build-84:
21+
docker build --build-arg phpVersion=8.4.0RC4 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.4 .
22+
.PHONY: build-81-alpine
23+
build-81-alpine:
24+
docker build --build-arg phpVersion=8.1 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.1-alpine .
25+
.PHONY: build-84-alpine
26+
build-84-alpine:
27+
docker build --build-arg phpVersion=8.4.0RC4 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.4.0RC4-alpine .

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![Build](https://github.com/jkaninda/laravel-php-fpm/actions/workflows/build.yml/badge.svg)](https://github.com/jkaninda/laravel-php-fpm/actions/workflows/build.yml)
2-
[![Integration Test](https://github.com/jkaninda/laravel-php-fpm/actions/workflows/integration-tests.yml/badge.svg)](https://github.com/jkaninda/laravel-php-fpm/actions/workflows/integration-tests.yml)
2+
[![Tests](https://github.com/jkaninda/laravel-php-fpm/actions/workflows/tests.yml/badge.svg)](https://github.com/jkaninda/laravel-php-fpm/actions/workflows/tests.yml)
33
![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/jkaninda/laravel-php-fpm?style=flat-square)
44
![Docker Pulls](https://img.shields.io/docker/pulls/jkaninda/laravel-php-fpm?style=flat-square)
55

‎src/docker/8.1/Dockerfile.alpine

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

‎src/docker/8.2/Dockerfile

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

0 commit comments

Comments
 (0)