mirror of
https://github.com/jkaninda/laravel-php-fpm.git
synced 2026-11-13 16:47:15 +00:00
Merge pull request #90 from jkaninda/dev
Upgrade images to PHP 8.5 and fix php-fpm not starting as root
This commit is contained in:
1 parent
033c6b213f
commit
7799d2fbc2
23 files changed
+705
-526
No files matched your search
@@ -1,27 +1,40 @@
|
||||
IMAGE_NAME?=jkaninda/laravel-php-fpm
|
||||
PHP_VERSIONS?=8.1 8.2 8.3 8.4 8.5
|
||||
LATEST_PHP?=8.5
|
||||
|
||||
.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 -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 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.4-alpine .
|
||||
build: $(addprefix build-,$(PHP_VERSIONS))
|
||||
|
||||
.PHONY: build-alpine
|
||||
build-alpine: $(addsuffix -alpine,$(addprefix build-,$(PHP_VERSIONS)))
|
||||
|
||||
.PHONY: build-latest
|
||||
build-latest: build-$(LATEST_PHP) build-$(LATEST_PHP)-alpine
|
||||
docker tag ${IMAGE_NAME}:$(LATEST_PHP) ${IMAGE_NAME}:latest
|
||||
docker tag ${IMAGE_NAME}:$(LATEST_PHP)-alpine ${IMAGE_NAME}:alpine
|
||||
|
||||
# Legacy images (7.2, 7.3, 7.4, 8.0)
|
||||
.PHONY: build-7.2 build-7.3 build-7.4 build-8.0
|
||||
build-7.2 build-7.3 build-7.4 build-8.0: build-%:
|
||||
docker build -f src/docker/$*/Dockerfile -t ${IMAGE_NAME}:$* .
|
||||
|
||||
.PHONY: build-%-alpine
|
||||
build-%-alpine:
|
||||
docker build --build-arg phpVersion=$* -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:$*-alpine .
|
||||
|
||||
.PHONY: build-%
|
||||
build-%:
|
||||
docker build --build-arg phpVersion=$* -f src/docker/Dockerfile -t ${IMAGE_NAME}:$* .
|
||||
|
||||
##@ Test
|
||||
.PHONY: test
|
||||
test: build-$(LATEST_PHP)
|
||||
IMAGE=${IMAGE_NAME}:$(LATEST_PHP) ./tests/integration.sh
|
||||
|
||||
.PHONY: test-alpine
|
||||
test-alpine: build-$(LATEST_PHP)-alpine
|
||||
IMAGE=${IMAGE_NAME}:$(LATEST_PHP)-alpine ./tests/integration.sh
|
||||
Reference in new issue
Block a user