Skip to content

upgrade frankenphp to latest #2 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 24, 2025
Merged

upgrade frankenphp to latest #2 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7573fa5
patch(frankenphp): #2 Update franken to latest
kevariable Nov 24, 2025
1a65075
patch(frankenphp): #2 Update franken to latest
kevariable Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ clean:
docker-compose down -v --remove-orphans

# Franken Worker targets
.PHONY: k6-franken-worker-products
k6-franken-worker-products:
@echo "Running products test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/list_products.js

.PHONY: k6-franken-worker-products-db
k6-franken-worker-products-db:
@echo "Running products DB test against Franken Worker..."
Expand All @@ -145,11 +140,6 @@ k6-franken-worker-products-redis:
@echo "Running products Redis test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/list_products_redis.js

.PHONY: k6-franken-worker-customers
k6-franken-worker-customers:
@echo "Running customers test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/list_customers.js

.PHONY: k6-franken-worker-customers-db
k6-franken-worker-customers-db:
@echo "Running customers DB test against Franken Worker..."
Expand All @@ -160,11 +150,6 @@ k6-franken-worker-customers-redis:
@echo "Running customers Redis test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/list_customers_redis.js

.PHONY: k6-franken-worker-orders
k6-franken-worker-orders:
@echo "Running orders test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/list_orders.js

.PHONY: k6-franken-worker-orders-db
k6-franken-worker-orders-db:
@echo "Running orders DB test against Franken Worker..."
Expand All @@ -175,17 +160,7 @@ k6-franken-worker-orders-redis:
@echo "Running orders Redis test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/list_orders_redis.js

.PHONY: k6-franken-worker-blog
k6-franken-worker-blog:
@echo "Running blog test against Franken Worker..."
k6 run --env BASE_URL=$(FRANKEN_WORKER_URL) k6/loadtest.js

# Franken targets
.PHONY: k6-franken-products
k6-franken-products:
@echo "Running products test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/list_products.js

.PHONY: k6-franken-products-db
k6-franken-products-db:
@echo "Running products DB test against Franken..."
Expand All @@ -196,11 +171,6 @@ k6-franken-products-redis:
@echo "Running products Redis test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/list_products_redis.js

.PHONY: k6-franken-customers
k6-franken-customers:
@echo "Running customers test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/list_customers.js

.PHONY: k6-franken-customers-db
k6-franken-customers-db:
@echo "Running customers DB test against Franken..."
Expand All @@ -211,11 +181,6 @@ k6-franken-customers-redis:
@echo "Running customers Redis test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/list_customers_redis.js

.PHONY: k6-franken-orders
k6-franken-orders:
@echo "Running orders test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/list_orders.js

.PHONY: k6-franken-orders-db
k6-franken-orders-db:
@echo "Running orders DB test against Franken..."
Expand All @@ -226,11 +191,6 @@ k6-franken-orders-redis:
@echo "Running orders Redis test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/list_orders_redis.js

.PHONY: k6-franken-blog
k6-franken-blog:
@echo "Running blog test against Franken..."
k6 run --env BASE_URL=$(FRANKEN_URL) k6/loadtest.js

# mysql read
.PHONY: k6-fpm-products-db
k6-fpm-products-db:
Expand All @@ -243,11 +203,6 @@ k6-fpm-products-redis:
@echo "Running products Redis test against FPM..."
k6 run --env BASE_URL=$(FPM_URL) k6/list_products_redis.js

.PHONY: k6-fpm-customers
k6-fpm-customers:
@echo "Running customers test against FPM..."
k6 run --env BASE_URL=$(FPM_URL) k6/list_customers.js

.PHONY: k6-fpm-customers-db
k6-fpm-customers-db:
@echo "Running customers DB test against FPM..."
Expand All @@ -258,11 +213,6 @@ k6-fpm-customers-redis:
@echo "Running customers Redis test against FPM..."
k6 run --env BASE_URL=$(FPM_URL) k6/list_customers_redis.js

.PHONY: k6-fpm-orders
k6-fpm-orders:
@echo "Running orders test against FPM..."
k6 run --env BASE_URL=$(FPM_URL) k6/list_orders.js

.PHONY: k6-fpm-orders-db
k6-fpm-orders-db:
@echo "Running orders DB test against FPM..."
Expand All @@ -273,53 +223,36 @@ k6-fpm-orders-redis:
@echo "Running orders Redis test against FPM..."
k6 run --env BASE_URL=$(FPM_URL) k6/list_orders_redis.js

.PHONY: k6-fpm-blog
k6-fpm-blog:
@echo "Running blog test against FPM..."
k6 run --env BASE_URL=$(FPM_URL) k6/loadtest.js

# Batch testing targets
.PHONY: k6-all-franken-worker
k6-all-franken-worker:
@echo "Running all tests against Franken Worker..."
$(MAKE) k6-franken-worker-products
$(MAKE) k6-franken-worker-products-db
$(MAKE) k6-franken-worker-products-redis
$(MAKE) k6-franken-worker-customers
$(MAKE) k6-franken-worker-customers-db
$(MAKE) k6-franken-worker-customers-redis
$(MAKE) k6-franken-worker-orders
$(MAKE) k6-franken-worker-orders-db
$(MAKE) k6-franken-worker-orders-redis
$(MAKE) k6-franken-worker-blog

.PHONY: k6-all-franken
k6-all-franken:
@echo "Running all tests against Franken..."
$(MAKE) k6-franken-products
$(MAKE) k6-franken-products-db
$(MAKE) k6-franken-products-redis
$(MAKE) k6-franken-customers
$(MAKE) k6-franken-customers-db
$(MAKE) k6-franken-customers-redis
$(MAKE) k6-franken-orders
$(MAKE) k6-franken-orders-db
$(MAKE) k6-franken-orders-redis
$(MAKE) k6-franken-blog

.PHONY: k6-all-fpm
k6-all-fpm:
@echo "Running all tests against FPM..."
$(MAKE) k6-fpm-products
$(MAKE) k6-fpm-products-db
$(MAKE) k6-fpm-products-redis
$(MAKE) k6-fpm-customers
$(MAKE) k6-fpm-customers-db
$(MAKE) k6-fpm-customers-redis
$(MAKE) k6-fpm-orders
$(MAKE) k6-fpm-orders-db
$(MAKE) k6-fpm-orders-redis
$(MAKE) k6-fpm-blog

.PHONY: k6-all-environments
k6-all-environments:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Before starting the application, you need to pull the required Docker images. Yo

**Option 1: Pull all images at once**
```bash
make docker
make pull-docker
```

**Option 2: Pull individual images**
Expand Down
12 changes: 10 additions & 2 deletions docker/Caddyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
worker {
file ./public/index.php
watch

num 1 # change number of worker

## Uncomment for incorrect config
# num_threads 16
# max_threads 8

## Uncomment for correct config
# num_threads 16
# max_threads 32
}

php_ini memory_limit 512M
Expand All @@ -15,8 +24,7 @@

{$SERVER_NAME:localhost} {
root {$SERVER_ROOT:public/}
encode zstd br gzip

encode zstd br gzip

{$CADDY_SERVER_EXTRA_DIRECTIVES}

Expand Down
3 changes: 1 addition & 2 deletions docker/Caddyfile.regular
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

{$SERVER_NAME:localhost} {
root {$SERVER_ROOT:public/}
encode zstd br gzip

encode zstd br gzip

{$CADDY_SERVER_EXTRA_DIRECTIVES}

Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.franken
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dunglas/frankenphp
FROM dunglas/frankenphp:php8.4-bookworm

WORKDIR /var/www/html

Expand All @@ -8,6 +8,8 @@ RUN install-php-extensions \
zip \
opcache

RUN apt update -y && apt install -y jq

COPY --chown=www-data:www-data . .
COPY ./docker/symfony.prod.ini /usr/local/etc/php/conf.d/symfony.prod.ini
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
Expand Down
Loading
Loading