diff --git a/.gitignore b/.gitignore index 1df5030..968c86d 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,6 @@ angular/test/build/ packages/vue/test/build/ .npmrc -TableBookingAPI/TableBooking/obj -TableBookingAPI/TableBooking/appsettings.json +TableBookingAPI/TableBooking.Api/obj +TableBookingAPI/TableBooking.Api/appsettings.json TableBookingAPI/.vs diff --git a/TableBooking.Api/Dockerfile b/TableBooking.Api/Dockerfile index a9987e3..b92ef9f 100644 --- a/TableBooking.Api/Dockerfile +++ b/TableBooking.Api/Dockerfile @@ -1,5 +1,3 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 @@ -7,10 +5,10 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["TableBooking/TableBooking.Api.csproj", "TableBooking/"] -RUN dotnet restore "TableBooking/TableBooking.Api.csproj" +COPY ["TableBooking.Api/TableBooking.Api.csproj", "TableBooking.Api/"] +RUN dotnet restore "TableBooking.Api/TableBooking.Api.csproj" COPY . . -WORKDIR "/src/TableBooking" +WORKDIR "/src/TableBooking.Api" RUN dotnet build "TableBooking.Api.csproj" -c Release -o /app/build FROM build AS publish diff --git a/docker-compose.yml b/docker-compose.yml index 9ebb0f8..335341c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: api: build: context: . - dockerfile: ./TableBooking/Dockerfile + dockerfile: ./TableBooking.Api/Dockerfile ports: - "7012:7012" depends_on: