diff --git a/Dockerfile b/Dockerfile index b0f9e6d..5905471 100644 --- a/Dockerfile +++ b/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: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,11 +23,9 @@ 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 --exclude=/app/dist/browser/config/* /app/dist/browser /usr/share/nginx/html RUN mkdir -p /usr/share/nginx/html/config diff --git a/doc.txt b/doc.txt index e847648..56aeab6 100644 --- a/doc.txt +++ b/doc.txt @@ -1,7 +1,7 @@ -To build an image "toto" with the version "0.1": podman build . -t skydivelogs:1.5.0 +To build an image "toto" with the version "0.1": podman build . -t skydivelogs:1.5.5 To run ab image to container with volume : - podman run -v C:\toto\config:/app/Front/config -v C:\toto\db:/app/API/Data -d -p 5080:80/tcp --name Test -it skydivelogs:1.5.0 + podman run -v C:\toto\config:/app/Front/config -v C:\toto\db:/app/API/Data -d -p 5080:80/tcp --name Test -it skydivelogs:1.5.5 -podman save --output skydivelogs-1.5.0.tar skydivelogs:1.5.0 +podman save --output skydivelogs-1.5.5.tar skydivelogs:1.5.5 -scp -P 5022 skydivelogs-1.5.0.tar administrator@51.75.68.58:~ +scp -P 5022 skydivelogs-1.5.5.tar administrator@51.75.68.58:~ diff --git a/startup.sh b/startup.sh deleted file mode 100644 index fecf36b..0000000 --- a/startup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -service nginx start - -cd /app/API/ -dotnet skydiveLogs-api.dll \ No newline at end of file