Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 17 additions & 9 deletions .env
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
# Reverse proxy
NGINX_IMAGE=nginx:stable-alpine
NGINX_IMAGE=nginx:stable-alpine3.23

# Backend + Frontend
# Backend
APP_IMAGE=fullstack-symfony-react-dev:0.9.1
APP_NAME=fullstack-symfony-react
APP_VERSION=0.9.1
APP_ENV=dev
NODE_IMAGE=node:23-alpine
ADMIN_EMAIL=admin@example.com
ADMIN_PASSWORD=secret

# Frontend
NODE_IMAGE=node:25.2-alpine

# DB
MYSQL_IMAGE=mysql:8
ADMINER_IMAGE=adminer
MYSQL_IMAGE=mysql:8.4
ADMINER_IMAGE=adminer:5.4.2

# Cache
REDIS_IMAGE=redis:7.2-alpine
REDIS_INSIGHTS_IMAGE=redis/redisinsight:latest
REDIS_INSIGHTS_IMAGE=redis/redisinsight:3.2

# Telemetry LGTM (all-in-one: OTel Collector + Grafana + Loki + Tempo + Prometheus)
OTEL_LGTM_IMAGE=grafana/otel-lgtm:0.8.1
OTEL_LGTM_IMAGE=grafana/otel-lgtm:0.21.0

# RabbitMQ
RABBITMQ_IMAGE=rabbitmq:latest
RABBITMQ_IMAGE=rabbitmq:4.2.5
RABBITMQ_USER=guest
RABBITMQ_PASSWORD=guest
RABBITMQ_PASSWORD=guest

# Documentation
MK_DOCS_IMAGE=squidfunk/mkdocs-material:9.7

# Dashboard
DASHBOARD_IMAGE=b4bz/homer:v25.11.1
2 changes: 1 addition & 1 deletion .github/workflows/app-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

strategy:
matrix:
node-version: ['v23.11']
node-version: ['v25.8']

steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ VERSION = 0.9.1
reset-worker reset-app init composer-install create-database create-schema \
load-fixtures init-test create-test-database create-test-schema composer shell \
qa sa cs test backend-test frontend-test arch clear cache-clear cache-pool-clear \
build-viz svg build-dot build-svg circle maintenance maintain show-composer-updates \
maintenance maintain show-composer-updates \
update-composer-dependencies update-npm-dependencies coverage frontend-shell open help

## Start development environment (build images, start containers, init, open browser)
start: dev grafana up init open

## Build development Docker image
build: dev prod

## Build development Docker image (with Docker cache)
dev:
docker build . -f ./build/php/Dockerfile --target dev -t ${APP_NAME}-dev:${VERSION}

## Build production images
## Build production images (without Docker cache)
prod: backend-image frontend-image

## Build backend image
## Build backend image (without Docker cache)
backend-image:
@echo "Build backend image"
docker build . -f ./build/php/Dockerfile --target prod --no-cache -t ${APP_NAME}:${VERSION}

## Build frontend image
## Build frontend image (without Docker cache)
frontend-image:
@echo "Build frontend image"
docker build . -f ./build/node/Dockerfile --target prod --no-cache -t ${APP_NAME}-web:${VERSION}
Expand Down
2 changes: 1 addition & 1 deletion build/grafana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/grafana:latest
FROM grafana/grafana:12.4

COPY grafana/ /etc/grafana/provisioning

Expand Down
7 changes: 0 additions & 7 deletions build/graphviz/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions build/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build-Stage
FROM node:23-alpine AS build
FROM node:25.2-alpine AS build

WORKDIR /app

Expand All @@ -24,7 +24,7 @@ COPY frontend/vitest.config.ts .
RUN npm run build

# Produktions-Stage
FROM node:23-alpine AS prod
FROM node:25.2-alpine AS prod

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion dashboard/assets/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ services:
- name: "Source code"
subtitle: "Github"
icon: "fa-brands fa-github"
url: "https://github.com/makomweb/fullstack-demo"
url: "https://github.com/makomweb/fullstack-symfony-react"
target: "_blank"
- name: "Architecture Documentation"
subtitle: "MKDocs"
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ services:

# documentation
mkdocs:
image: squidfunk/mkdocs-material
image: ${MK_DOCS_IMAGE}
ports:
- "8005:8000"
volumes:
Expand All @@ -197,7 +197,7 @@ services:

# developer dashboard
dashboard:
image: b4bz/homer:latest
image: ${DASHBOARD_IMAGE}
volumes:
- ./dashboard/assets:/www/assets
- ./backend/report:/www/public/report
Expand Down
34 changes: 25 additions & 9 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading