-- checkpoint

Author: brunobritodev

.dockerignore

@@ -1,10 +1,29 @@
-.dockerignore
-.env
-.git
-.gitignore
-**/.vs/
-.vscode
-*/bin
-*/obj
-**/.toolstarget
+[Oo]bj/
+[Bb]in/
+TestResults/
+.nuget/
+_ReSharper.*/
+packages/
+artifacts/
+PublishProfiles/
+*.user
+*.suo
+*.cache
+*.docstates
+_ReSharper.*
+nuget.exe
+*net45.csproj
+*k10.csproj
+*.psess
+*.vsp
+*.pidb
+*.userprefs
+*DS_Store
+*.ncrunchsolution
+*.*sdf
+*.ipch
+.vs/
+project.lock.json
+
+bower_components/
 node_modules/

admin-ui.dockerfile

@@ -0,0 +1,41 @@
+# base image
+FROM node:10-alpine as builder
+
+# install and cache app dependencies
+COPY ["src/Frontend/Jp.AdminUI/package.json", "./"]
+COPY ["src/Frontend/Jp.AdminUI/package-lock.json", "./"]
+
+## Storing node modules on a separate layer will prevent unnecessary npm installs at each build
+
+RUN npm ci && mkdir /app && mv ./node_modules ./app/
+
+WORKDIR /app
+
+# add app
+COPY ["src/Frontend/Jp.AdminUI/", "/app"]
+
+# rebuild node
+RUN npm rebuild node-sass
+# generate build
+RUN npm run ng build -- --configuration=docker
+
+##################
+### production ###
+##################
+
+# base image
+FROM nginx:1.13.3-alpine
+
+## Remove default nginx website
+RUN rm -rf /usr/share/nginx/html/*
+
+# copy artifact build from the 'build environment'
+COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+
+# expose port 80
+EXPOSE 80/tcp
+
+# run nginx
+CMD ["nginx", "-g", "daemon off;"]

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     #############################
     # Database
     #############################
-    database:
+    jpdatabase:
       image: mysql
       command: --default-authentication-plugin=mysql_native_password
       restart: always
@@ -18,26 +18,25 @@ services:
     #############################
     # Server SSO
     #############################
-    sso:
+    jpproject:
         image: "jpproject-sso"
         build: 
           context: .
           dockerfile: sso.dockerfile
         ports:
-            - "5001:5001"
-            - "5000:5000"
+            - "5000:443"
+            - "5001:80"
         links:
-            - database
+            - jpdatabase
         depends_on:
-            - database
+            - jpdatabase
         environment: 
             DATABASE_TYPE: "MySql"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=database,port=3306;database=jpproject;user=jp;password=10203040"
-            ASPNETCORE_ENVIRONMENT: "Development"
-            # ISSUER_URI: "http://localhost:5000"
+            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
             ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
             ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
-            ASPNETCORE_URLS: https://+:5000;http://+:5001
+            ASPNETCORE_ENVIRONMENT: "Development"
+            ASPNETCORE_URLS: https://+:443;http://+:80
 
     #############################
     # Management API
@@ -51,21 +50,39 @@ services:
             - "5003:5003"
             - "5002:5002"
         depends_on:
-            - database
+            - jpdatabase
         environment: 
             DATABASE_TYPE: "MySql"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=database,port=3306;database=jpproject;user=jp;password=10203040"
+            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
+            ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
+            ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
             ASPNETCORE_ENVIRONMENT: "Development"
-            AUTHORITY: "http://localhost:5000"
+            AUTHORITY: "https://jpproject:5000"
             ASPNETCORE_URLS: "https://+:5003;http://+:5002"
 
     #############################
     # User management UI
     #############################
-    user-management-ui:
+    user-ui:
         container_name: jpproject-user-management-ui
         build: 
           context: .
           dockerfile: ui-user-management.dockerfile
+        depends_on:
+            - jpproject-api
+            - jpproject
+        ports:
+            - 4200:80
+    #############################
+    # Admin Ui
+    #############################
+    admin-ui:
+        container_name: jpproject-admin-ui
+        build: 
+          context: .
+          dockerfile: ui-user-management.dockerfile
+        depends_on:
+            - jpproject-api
+            - jpproject
         ports:
-            - 4300:80
+            - 4300:80

keys/jpproject.cer

@@ -0,0 +1,27 @@
+server {
+
+  listen 80;
+
+  sendfile on;
+
+  default_type application/octet-stream;
+
+
+  gzip on;
+  gzip_http_version 1.1;
+  gzip_disable      "MSIE [1-6]\.";
+  gzip_min_length   1100;
+  gzip_vary         on;
+  gzip_proxied      expired no-cache no-store private auth;
+  gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+  gzip_comp_level   9;
+
+
+  root /usr/share/nginx/html;
+
+
+  location / {
+    try_files $uri $uri/ /index.html =404;
+  }
+
+}

src/Frontend/Jp.AdminUI/nginx/nginx.conf

@@ -0,0 +1,12 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false,
+  ResourceServer: "https://localhost:5003/",
+  IssuerUri:  "https://jpproject:5000",
+  RequireHttps: false,
+  Uri: "http://localhost:4300"
+};

src/Frontend/Jp.AdminUI/package-lock.json

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore;
+using System.Data.Common;
+
+namespace Jp.UI.SSO.Configuration
+{
+    public class DbHealthChecker
+    {
+        public bool TestConnection(DbContext context)
+        {
+            DbConnection conn = context.Database.GetDbConnection();
+            try
+            {
+                conn.Open();   // Check the database connection
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}

src/Frontend/Jp.AdminUI/src/environments/environment.docker.ts

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Jp.UI.SSO.Configuration;
 
 namespace Jp.UI.SSO.Util
 {
@@ -42,6 +43,7 @@ public static async Task EnsureSeedData(IServiceProvider serviceProvider)
                 var id4Context = scope.ServiceProvider.GetRequiredService<JpContext>();
                 var storeDb = scope.ServiceProvider.GetRequiredService<EventStoreContext>();
 
+                await WaitForDb(id4Context);
                 await id4Context.Database.MigrateAsync();
                 await userContext.Database.MigrateAsync();
                 await storeDb.Database.MigrateAsync();
@@ -125,5 +127,25 @@ private static async Task EnsureSeedIdentityServerData(JpContext context)
                 await context.SaveChangesAsync();
             }
         }
+
+        private static async Task WaitForDb(DbContext context)
+        {
+            var maxAttemps = 12;
+            var delay = 5000;
+
+            var healthChecker = new DbHealthChecker();
+            for (int i = 0; i < maxAttemps; i++)
+            {
+                if (healthChecker.TestConnection(context))
+                {
+                    return;
+                }
+                await Task.Delay(delay);
+            }
+
+            // after a few attemps we give up
+            throw new Exception("Error wating database");
+
+        }
     }
 }

src/Frontend/Jp.UI.SSO/Configuration/DbHealthChecker.cs

@@ -13287,3 +13287,6 @@ MySql.Data.MySqlClient.MySqlException (0x80004005): Access denied for user 'brun
 2019-03-26 17:05:45.339 -03:00 [DBG] Using Identity.External as default ASP.NET Core scheme for sign-out
 2019-03-26 17:05:45.342 -03:00 [DBG] Using Identity.Application as default ASP.NET Core scheme for challenge
 2019-03-26 17:05:45.343 -03:00 [DBG] Using Identity.Application as default ASP.NET Core scheme for forbid
+2019-03-27 02:38:38.654 -03:00 [INF] SigninCredentialExtension keyType is File
+2019-03-27 02:38:38.773 -03:00 [INF] SigninCredentialExtension adding key from file jpproject.pfx
+2019-03-27 02:38:38.812 -03:00 [INF] SigninCredentialExtension added