Skip to content

Commit b917132

Browse files
authored
Merge pull request #1 from makomweb/martin/pin-images
pin images
2 parents 3021408 + 4d0198a commit b917132

9 files changed

Lines changed: 56 additions & 37 deletions

File tree

.env

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
# Reverse proxy
2-
NGINX_IMAGE=nginx:stable-alpine
2+
NGINX_IMAGE=nginx:stable-alpine3.23
33

4-
# Backend + Frontend
4+
# Backend
55
APP_IMAGE=fullstack-symfony-react-dev:0.9.1
66
APP_NAME=fullstack-symfony-react
77
APP_VERSION=0.9.1
88
APP_ENV=dev
9-
NODE_IMAGE=node:23-alpine
109
ADMIN_EMAIL=admin@example.com
1110
ADMIN_PASSWORD=secret
1211

12+
# Frontend
13+
NODE_IMAGE=node:25.2-alpine
14+
1315
# DB
14-
MYSQL_IMAGE=mysql:8
15-
ADMINER_IMAGE=adminer
16+
MYSQL_IMAGE=mysql:8.4
17+
ADMINER_IMAGE=adminer:5.4.2
1618

1719
# Cache
1820
REDIS_IMAGE=redis:7.2-alpine
19-
REDIS_INSIGHTS_IMAGE=redis/redisinsight:latest
21+
REDIS_INSIGHTS_IMAGE=redis/redisinsight:3.2
2022

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

2426
# RabbitMQ
25-
RABBITMQ_IMAGE=rabbitmq:latest
27+
RABBITMQ_IMAGE=rabbitmq:4.2.5
2628
RABBITMQ_USER=guest
27-
RABBITMQ_PASSWORD=guest
29+
RABBITMQ_PASSWORD=guest
30+
31+
# Documentation
32+
MK_DOCS_IMAGE=squidfunk/mkdocs-material:9.7
33+
34+
# Dashboard
35+
DASHBOARD_IMAGE=b4bz/homer:v25.11.1

.github/workflows/app-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
strategy:
6161
matrix:
62-
node-version: ['v23.11']
62+
node-version: ['v25.8']
6363

6464
steps:
6565
- uses: actions/checkout@v4

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,27 @@ VERSION = 0.9.1
77
reset-worker reset-app init composer-install create-database create-schema \
88
load-fixtures init-test create-test-database create-test-schema composer shell \
99
qa sa cs test backend-test frontend-test arch clear cache-clear cache-pool-clear \
10-
build-viz svg build-dot build-svg circle maintenance maintain show-composer-updates \
10+
maintenance maintain show-composer-updates \
1111
update-composer-dependencies update-npm-dependencies coverage frontend-shell open help
1212

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

16-
## Build development Docker image
16+
build: dev prod
17+
18+
## Build development Docker image (with Docker cache)
1719
dev:
1820
docker build . -f ./build/php/Dockerfile --target dev -t ${APP_NAME}-dev:${VERSION}
1921

20-
## Build production images
22+
## Build production images (without Docker cache)
2123
prod: backend-image frontend-image
2224

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

28-
## Build frontend image
30+
## Build frontend image (without Docker cache)
2931
frontend-image:
3032
@echo "Build frontend image"
3133
docker build . -f ./build/node/Dockerfile --target prod --no-cache -t ${APP_NAME}-web:${VERSION}

build/grafana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM grafana/grafana:latest
1+
FROM grafana/grafana:12.4
22

33
COPY grafana/ /etc/grafana/provisioning
44

build/graphviz/Dockerfile

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

build/node/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build-Stage
2-
FROM node:23-alpine AS build
2+
FROM node:25.2-alpine AS build
33

44
WORKDIR /app
55

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

2626
# Produktions-Stage
27-
FROM node:23-alpine AS prod
27+
FROM node:25.2-alpine AS prod
2828

2929
WORKDIR /app
3030

dashboard/assets/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ services:
5656
- name: "Source code"
5757
subtitle: "Github"
5858
icon: "fa-brands fa-github"
59-
url: "https://github.com/makomweb/fullstack-demo"
59+
url: "https://github.com/makomweb/fullstack-symfony-react"
6060
target: "_blank"
6161
- name: "Architecture Documentation"
6262
subtitle: "MKDocs"

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ services:
185185

186186
# documentation
187187
mkdocs:
188-
image: squidfunk/mkdocs-material
188+
image: ${MK_DOCS_IMAGE}
189189
ports:
190190
- "8005:8000"
191191
volumes:
@@ -197,7 +197,7 @@ services:
197197

198198
# developer dashboard
199199
dashboard:
200-
image: b4bz/homer:latest
200+
image: ${DASHBOARD_IMAGE}
201201
volumes:
202202
- ./dashboard/assets:/www/assets
203203
- ./backend/report:/www/public/report

frontend/package-lock.json

Lines changed: 25 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)