diff --git a/Dockerfile b/Dockerfile index 9e1aff2..62476ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,29 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. FROM mcr.microsoft.com/dotnet/aspnet:7.0.10-bookworm-slim-amd64 AS base -WORKDIR /app EXPOSE 80 RUN apt-get -y update RUN apt-get -y install nginx +RUN mkdir /app + RUN mkdir /app/Front +COPY Front/skydivelogs-app/dist /app/Front + RUN mkdir /app/API +COPY Back/dist /app/API -WORKDIR /app/Front -COPY Front/skydivelogs-app/dist . - -WORKDIR /app/API -COPY Back/dist . - -COPY start-docker.sh /start-docker.sh -RUN chmod +x /start-docker.sh +RUN rm -f /app/startup.sh +COPY startup.sh /app +RUN chmod 755 /app/startup.sh RUN update-rc.d nginx defaults - COPY nginx.conf /etc/nginx/sites-available/default VOLUME /app/API/Data VOLUME /app/Front/config -CMD ["/start-docker.sh"] \ No newline at end of file +ENV ASPNETCORE_URLS http://+:5001 + +CMD ["sh", "/app/startup.sh"] \ No newline at end of file diff --git a/doc.txt b/doc.txt index 3b08fd2..98da97e 100644 --- a/doc.txt +++ b/doc.txt @@ -1,5 +1,6 @@ To build an image "toto" with the version "0.1": docker build . -t skydivelogs:1.4.0 -To run ab image to container with volume : docker run -v C:\toto\logs\config:/app/Front/config -v C:\toto\logs\db:/app/API/Data -p 5080:80/tcp --name Test -it skydivelogs:0.1 +To run ab image to container with volume : + docker 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.4.0 docker save --output skydivelogs-1.4.0.tar skydivelogs:1.4.0 diff --git a/start-docker.sh b/start-docker.sh deleted file mode 100644 index 1005408..0000000 --- a/start-docker.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -service nginx start - -cd /app/API/ -dotnet skydiveLogs-api.dll --verbose d --urls=http://localhost:5001 \ No newline at end of file diff --git a/startup.sh b/startup.sh new file mode 100644 index 0000000..fecf36b --- /dev/null +++ b/startup.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +service nginx start + +cd /app/API/ +dotnet skydiveLogs-api.dll \ No newline at end of file