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
4 changes: 2 additions & 2 deletions .github/workflows/app-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ jobs:

strategy:
matrix:
node-version: [20]
node-version: [25]

steps:
- uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand Down
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ VERSION = 0.1.4
.PHONY: build prod start

help:
@echo "📋 Available targets:\n"
@echo "🏗️ Build & Setup:"
@echo " make start - Build development image, boot stack, initialize db, and open browser"
@echo " make build - Build development Docker image"
@echo " make dev - Build development Docker image"
@echo " make prod - Build production Docker images (app + web)"
@echo " make up - Boot the Docker Compose stack"
@echo " make down - Shut down the Docker Compose stack"
Expand All @@ -33,17 +32,19 @@ help:
@echo " make clear - Clear all caches"
@echo " make open - Open application in browser\n"

start: build up init open
start: dev up init open

build:
dev:
@echo "🏗️ Building development image(s)..."
docker build . -f ./build/php/Dockerfile --target dev --no-cache -t ${APP_NAME}-dev:${VERSION}
docker build . -f ./build/php/Dockerfile --target dev -t ${APP_NAME}-dev:${VERSION}

prod:
@echo "🛳️ Building procution image(s)..."
docker build . -f ./build/php/Dockerfile --target prod --no-cache -t ${APP_NAME}:${VERSION}
docker build . -f ./build/nginx/Dockerfile --no-cache -t ${APP_NAME}-web:${VERSION}

build: dev prod

up:
@echo "🚀 Booting Docker stack..."
docker compose up -d --remove-orphans
Expand Down
2 changes: 1 addition & 1 deletion build/nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /frontend

COPY frontend .

RUN npm install && npm run build
RUN npm ci && npm run build

# The vite config outputs to ../backend/public/build from /frontend context
# That path resolves to /backend/public/build, copy it to /dist
Expand Down
2 changes: 1 addition & 1 deletion build/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ WORKDIR /frontend

COPY frontend .

RUN npm install && npm run build
RUN npm ci && npm run build

RUN cp -r /backend/public/build /dist

Expand Down
35 changes: 32 additions & 3 deletions frontend/package-lock.json

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

Loading