Merge pull request #81 from jkaninda/develop

Add add php 8.4 RC
jkaninda · Nov 17, 2024 · d4f8c74 · d4f8c74
2 parents 1733a63 + da5a209
commit d4f8c74
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 294 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,82 +3,104 @@ on:
   push:
     branches:
       - master
-
-env:
-  BUILDKIT_IMAGE: jkaninda/laravel-php-fpm
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - 
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
       - 
         name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push 8.0
+        name: Build and push 8.1
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.0/Dockerfile"
+          file: "./src/docker/Dockerfile"
           push: true
-          tags: "${{env.BUILDKIT_IMAGE}}:8.0"
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            phpVersion=8.1
+          tags: "${{ vars.BUILDKIT_IMAGE }}:8.1"
       -
-        name: Build and push 8.1
+        name: Build and push 8.1 alpine
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.1/Dockerfile"
+          file: "./src/docker/Dockerfile.alpine"
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: "${{env.BUILDKIT_IMAGE}}:8.1"
+          build-args: |
+            phpVersion=8.1
+          tags: "${{ vars.BUILDKIT_IMAGE }}:8.1-alpine"
       -
         name: Build and push 8.2
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.2/Dockerfile"
+          file: "./src/docker/Dockerfile"
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: "${{env.BUILDKIT_IMAGE}}:8.2"
+          build-args: |
+            phpVersion=8.2
+          tags: "${{vars.BUILDKIT_IMAGE}}:8.2"
       -
-        name: Build and push 8.1 alpine
+        name: Build and push 8.2 alpine
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.1/Dockerfile.alpine"
+          file: "./src/docker/Dockerfile.alpine"
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.1-alpine"
+          build-args: |
+            phpVersion=8.2
+          tags: "${{vars.BUILDKIT_IMAGE}}:8.2-alpine"
       -
-        name: Build and push 8.2 alpine
+        name: Build and push 8.3
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.2/Dockerfile.alpine"
+          file: "./src/docker/Dockerfile"
           push: true
           platforms: linux/amd64,linux/arm64
+          build-args: |
+            phpVersion=8.3
           tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.2-alpine"
+           "${{vars.BUILDKIT_IMAGE}}:8.3"
+           "${{vars.BUILDKIT_IMAGE}}:latest"
       -
         name: Build and push 8.3 alpine
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.3/Dockerfile.alpine"
+          file: "./src/docker/Dockerfile.alpine"
           push: true
           platforms: linux/amd64,linux/arm64
+          build-args: |
+            phpVersion=8.3
           tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.3-alpine"
+           "${{vars.BUILDKIT_IMAGE}}:8.3-alpine"
       -
-        name: Build and push 8.3
+        name: Build and push 8.4 RC
+        uses: docker/build-push-action@v3
+        with:
+          file: "./src/docker/Dockerfile"
+          push: true
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            phpVersion=8.4.0RC4
+          tags: |
+           "${{vars.BUILDKIT_IMAGE}}:8.4.0RC4"
+      -
+        name: Build and push 8.4 RC alpine
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.3/Dockerfile"
+          file: "./src/docker/Dockerfile.alpine"
           push: true
           platforms: linux/amd64,linux/arm64
+          build-args: |
+            phpVersion=8.4.0RC4
           tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.3"
-           "${{env.BUILDKIT_IMAGE}}:latest"
+           "${{vars.BUILDKIT_IMAGE}}:8.4.0RC4-alpine"
diff --git a/.github/workflows/integration-tests.yml → .github/workflows/tests.yml b/.github/workflows/integration-tests.yml → .github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: Integration Test
+name: Tests
 on:
   push:
 jobs:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,27 @@
-IMAGE_NAME:jkaninda/laravel-php-fpm
-build-8.1:
-	docker buildx build -f src/docker/8.1/Dockerfile -t ${IMAGE_NAME}:8.1 .
-build-8.2:
-	docker buildx build -f src/docker/8.2/Dockerfile -t ${IMAGE_NAME}:8.2 .
-build-8.3:
-	docker buildx build -f src/docker/8.3/Dockerfile -t ${IMAGE_NAME}:8.3 .
+IMAGE_NAME?=jkaninda/laravel-php-fpm
+.PHONY: all
+all: build
+##@ Build
+.PHONY: build
+build: build-81 build-82 build-83 build-84
+.PHONY: build-80
+build-80:
+	 docker build --build-arg phpVersion=8.0 -f src/docker/8.0/Dockerfile -t ${IMAGE_NAME}:8.0 .
+.PHONY: build-81
+build-81:
+	 docker build --build-arg phpVersion=8.1 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.1 .
+.PHONY: build-82
+build-82:
+	 docker build --build-arg phpVersion=8.2 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.2 .
+.PHONY: build-83
+build-83:
+	 docker build --build-arg phpVersion=8.3 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.3 .
+.PHONY: build-84
+build-84:
+	 docker build --build-arg phpVersion=8.4.0RC4 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.4 .
+.PHONY: build-81-alpine
+build-81-alpine:
+	 docker build --build-arg phpVersion=8.1 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.1-alpine .
+.PHONY: build-84-alpine
+build-84-alpine:
+	 docker build --build-arg phpVersion=8.4.0RC4 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.4.0RC4-alpine .
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![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)
-[![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)
+[![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)
 ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/jkaninda/laravel-php-fpm?style=flat-square)
 ![Docker Pulls](https://img.shields.io/docker/pulls/jkaninda/laravel-php-fpm?style=flat-square)
 

diff --git a/src/docker/8.1/Dockerfile.alpine b/src/docker/8.1/Dockerfile.alpine
diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile