Crowmate/Nest
Archived
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update Dockerfile and nginx configuration for improved API routing; modify events API response structure

Browse Source
This commit is contained in:
Thibault Pouch
2026-03-03 10:24:31 +01:00
parent d08cda9d22
commit db647fe7ac
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nest-front/Dockerfile
View File

@@ -17,14 +17,8 @@ RUN npm run build
FROM nginx:alpine FROM nginx:alpine
COPY --from=build /app/dist /usr/share/nginx/html COPY --from=build /app/dist /usr/share/nginx/html
COPY nginx.conf /etc/nginx/nginx.conf.template COPY nginx.conf /etc/nginx/conf.d/default.conf
EXPOSE 80 EXPOSE 80
# API_URL is the backend's public base URL used by nginx proxy_pass. CMD ["nginx", "-g", "daemon off;"]
# Set this at runtime in Coolify, e.g. API_URL=https://api.crowmate.fr
ENV API_URL=http://localhost:3000
# Substitute ${API_URL} in the nginx template at container start, then launch nginx.
# The quoted variable list prevents envsubst from replacing nginx variables like $host.
CMD ["/bin/sh", "-c", "envsubst '${API_URL}' < /etc/nginx/nginx.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"]

6
nest-front/nginx.conf
View File

@@ -3,8 +3,12 @@ server {
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.html; index index.html;
# Use Docker's embedded DNS resolver; defer resolution to request time
resolver 127.0.0.11 valid=30s;
location /api/ { location /api/ {
proxy_pass ${API_URL}/api/; set $api_upstream http://api:3000;
proxy_pass $api_upstream;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

2
nest-front/src/pages/public/EventsPage.tsx
View File

@@ -257,7 +257,7 @@ export default function EventsPage() {
useEffect(() => { useEffect(() => {
eventsApi.getEvents(true) eventsApi.getEvents(true)
.then((res) => setEvents(res.data)) .then((res) => setEvents(res.events))
.catch(() => setEvents([])) .catch(() => setEvents([]))
.finally(() => setLoading(false)); .finally(() => setLoading(false));
}, []); }, []);

2
nest-front/src/utils/api.ts
View File

@@ -173,7 +173,7 @@ export const eventsApi = {
getEvents: (publicOnly = true) => { getEvents: (publicOnly = true) => {
const q = new URLSearchParams({ limit: '50' }); const q = new URLSearchParams({ limit: '50' });
if (publicOnly) q.set('public', 'true'); if (publicOnly) q.set('public', 'true');
return apiFetch<{ data: EventPost[]; total: number; page: number; pages: number }>( return apiFetch<{ events: EventPost[]; total: number; page: number; pages: number }>(
`/events?${q}` `/events?${q}`
); );
}, },