update Angular to v20
Reviewed-on: #4 Co-authored-by: sandre <perso@sebastienandre.com> Co-committed-by: sandre <perso@sebastienandre.com>
This commit was merged in pull request #4.
This commit is contained in:
19
Dockerfile
19
Dockerfile
@@ -2,15 +2,17 @@
|
||||
|
||||
# Use the official Microsoft ASP.NET Core image to build the backend
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-backend
|
||||
WORKDIR "/src/backend"
|
||||
COPY Back/ .
|
||||
RUN dotnet restore "skydiveLogs-api/skydiveLogs-api.csproj"
|
||||
RUN dotnet publish "skydiveLogs-api/skydiveLogs-api.csproj" -c Release -o /app/publish
|
||||
WORKDIR /src/backend
|
||||
COPY Back .
|
||||
RUN dotnet restore skydiveLogs-api/skydiveLogs-api.csproj
|
||||
RUN dotnet publish skydiveLogs-api/skydiveLogs-api.csproj -c Release -o /app/publish
|
||||
|
||||
# Use the official node image to build the Angular app
|
||||
FROM node:20-alpine AS build-frontend
|
||||
FROM node:22-alpine AS build-frontend
|
||||
WORKDIR /app
|
||||
COPY ["Front/skydivelogs-app/package.json", "Front/skydivelogs-app/package-lock.json*", "./"]
|
||||
# COPY ["../Front/skydivelogs-app/package.json", "../Front/skydivelogs-app/package-lock.json*", "./"]
|
||||
COPY Front/skydivelogs-app/package.json .
|
||||
COPY Front/skydivelogs-app/package-lock.json .
|
||||
RUN npm install
|
||||
COPY --exclude=Front/skydivelogs-app/node_modules/* Front/skydivelogs-app/ .
|
||||
RUN npm run build
|
||||
@@ -21,13 +23,12 @@ WORKDIR /app
|
||||
|
||||
# Install nginx
|
||||
RUN apt-get update && apt-get install -y nginx curl && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Copy custom nginx configuration
|
||||
COPY nginx.conf /etc/nginx/sites-available/default
|
||||
RUN rm -rf /usr/share/nginx/html/*
|
||||
|
||||
# Copy frontend dist folder to nginx html directory
|
||||
COPY --from=build-frontend /app/dist/browser /usr/share/nginx/html
|
||||
COPY --from=build-frontend --exclude=/app/dist/browser/config/* /app/dist/browser /usr/share/nginx/html
|
||||
RUN mkdir -p /usr/share/nginx/html/config
|
||||
|
||||
# Copy backend from the correct build stage
|
||||
COPY --from=build-backend /app/publish /app
|
||||
|
||||
Reference in New Issue
Block a user