From 3c696f877c3179bc99517b05129d30b816542d53 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 29 Aug 2020 09:17:46 -0500
Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=94=A8=F0=9F=9A=A7=20misc=20WIP?=
 =?UTF-8?q?=20build=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.override.yml                   |  1 -
 docker-compose.yml                            |  2 ++
 .../src/FilterLists.Directory.Api/Dockerfile  | 24 +++++++--------
 .../FilterLists.Directory.Api/Dockerfile.dev  | 30 ++++++++++++++++++-
 web/Dockerfile.dev                            |  2 +-
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 3f2b7e2f0..fd9ee2339 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -24,7 +24,6 @@ services:
       dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile.dev
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://+:80
 
   directory.db:
     command: ["postgres", "-c", "log_statement=all"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 610716038..b228c7d63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,8 @@ services:
       - directory.db
     environment:
       ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING}
+    environment:
+      - ASPNETCORE_URLS=http://+:80
 
   directory.db:
     image: postgres:alpine
diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile b/services/directory/src/FilterLists.Directory.Api/Dockerfile
index 09fd32357..0d2fd8cab 100644
--- a/services/directory/src/FilterLists.Directory.Api/Dockerfile
+++ b/services/directory/src/FilterLists.Directory.Api/Dockerfile
@@ -2,31 +2,31 @@
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine AS base
 WORKDIR /app
 EXPOSE 80
-ENTRYPOINT ./FilterLists.Directory.Api
 
 # init build
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build
 
 # restore
 WORKDIR /src
-COPY src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj FilterLists.Directory.Domain/
-COPY src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj FilterLists.Directory.Infrastructure/
-COPY src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj FilterLists.Directory.Infrastructure.Migrations/
-COPY src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj FilterLists.Directory.Application/
+COPY directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj FilterLists.Directory.Domain/
+COPY directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj FilterLists.Directory.Infrastructure/
+COPY directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj FilterLists.Directory.Infrastructure.Migrations/
+COPY directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj FilterLists.Directory.Application/
 WORKDIR /src/FilterLists.Directory.Api
-COPY src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
+COPY directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
 RUN dotnet restore
 
 # build
 WORKDIR /src
-COPY src/FilterLists.Directory.Domain/. FilterLists.Directory.Domain/
-COPY src/FilterLists.Directory.Infrastructure/. FilterLists.Directory.Infrastructure/
-COPY src/FilterLists.Directory.Infrastructure.Migrations/. FilterLists.Directory.Infrastructure.Migrations/
-COPY src/FilterLists.Directory.Application/. FilterLists.Directory.Application/
+COPY directory/src/FilterLists.Directory.Domain/. FilterLists.Directory.Domain/
+COPY directory/src/FilterLists.Directory.Infrastructure/. FilterLists.Directory.Infrastructure/
+COPY directory/src/FilterLists.Directory.Infrastructure.Migrations/. FilterLists.Directory.Infrastructure.Migrations/
+COPY directory/src/FilterLists.Directory.Application/. FilterLists.Directory.Application/
 WORKDIR /src/FilterLists.Directory.Api
-COPY src/FilterLists.Directory.Api/. .
+COPY directory/src/FilterLists.Directory.Api/. .
 RUN dotnet publish --no-restore -c Release -o /app/publish -r linux-musl-x64 -p:PublishSingleFile=true
 
 # package final
 FROM base AS final
-COPY --from=build /app/publish .
\ No newline at end of file
+COPY --from=build /app/publish .
+ENTRYPOINT ./FilterLists.Directory.Api
\ No newline at end of file
diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev b/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev
index 478e9a877..f91d1a09b 100644
--- a/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev
+++ b/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev
@@ -1,4 +1,32 @@
 # init base for Visual Studio debugging
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine AS base
 WORKDIR /app
-EXPOSE 80
\ No newline at end of file
+EXPOSE 80
+
+# init build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build
+
+# restore
+WORKDIR /src
+COPY directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj FilterLists.Directory.Domain/
+COPY directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj FilterLists.Directory.Infrastructure/
+COPY directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj FilterLists.Directory.Infrastructure.Migrations/
+COPY directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj FilterLists.Directory.Application/
+WORKDIR /src/FilterLists.Directory.Api
+COPY directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
+RUN dotnet restore
+
+# build
+WORKDIR /src
+COPY directory/src/FilterLists.Directory.Domain/. FilterLists.Directory.Domain/
+COPY directory/src/FilterLists.Directory.Infrastructure/. FilterLists.Directory.Infrastructure/
+COPY directory/src/FilterLists.Directory.Infrastructure.Migrations/. FilterLists.Directory.Infrastructure.Migrations/
+COPY directory/src/FilterLists.Directory.Application/. FilterLists.Directory.Application/
+WORKDIR /src/FilterLists.Directory.Api
+COPY directory/src/FilterLists.Directory.Api/. .
+RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
+
+# package final
+FROM base AS final
+COPY --from=build /app/publish .
+ENTRYPOINT ./FilterLists.Directory.Api
\ No newline at end of file
diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev
index 5cb976b28..a6d488a17 100644
--- a/web/Dockerfile.dev
+++ b/web/Dockerfile.dev
@@ -6,7 +6,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 RUN npm install react-scripts -g
 WORKDIR /usr/src/app/
 COPY package*.json ./
-RUN npm install
+RUN npm i
 
 # start
 COPY . ./