Running docker-compose.

Kayes-Islam · Jun 13, 2021 · 6b225dd · 6b225dd
1 parent 12b7cd0
commit 6b225dd
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 3 deletions.
diff --git a/WebApi/.dockerignore → Api/.dockerignore b/WebApi/.dockerignore → Api/.dockerignore
diff --git a/WebApi/.gitignore → Api/.gitignore b/WebApi/.gitignore → Api/.gitignore
diff --git a/WebApi/WebApi/Dockerfile → Api/Dockerfile b/WebApi/WebApi/Dockerfile → Api/Dockerfile
diff --git a/WebApi/WebApi.sln → Api/WebApi.sln b/WebApi/WebApi.sln → Api/WebApi.sln
diff --git a/.../Controllers/WeatherForecastController.cs → .../Controllers/WeatherForecastController.cs b/.../Controllers/WeatherForecastController.cs → .../Controllers/WeatherForecastController.cs
diff --git a/WebApi/WebApi/Program.cs → Api/WebApi/Program.cs b/WebApi/WebApi/Program.cs → Api/WebApi/Program.cs
diff --git a/WebApi/WebApi/Properties/launchSettings.json → Api/WebApi/Properties/launchSettings.json b/WebApi/WebApi/Properties/launchSettings.json → Api/WebApi/Properties/launchSettings.json
diff --git a/WebApi/WebApi/Startup.cs → Api/WebApi/Startup.cs b/WebApi/WebApi/Startup.cs → Api/WebApi/Startup.cs
@@ -32,13 +32,17 @@ public void ConfigureServices(IServiceCollection services)
                 x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
             }).AddJwtBearer(x =>
             {
-                x.MetadataAddress = "http://localhost:8080/auth/realms/AuthDemoRealm/.well-known/openid-configuration";
+                x.MetadataAddress = "http://keycloak:8080/auth/realms/AuthDemoRealm/.well-known/openid-configuration";
                 x.RequireHttpsMetadata = false; // only for dev
                 x.SaveToken = true;
                 x.TokenValidationParameters = new TokenValidationParameters
                 {
                     ValidateIssuer = true,
-                    //ValidIssuer = "",
+                    // NOTE: Usually you don't need to set the issuer since the middleware will extract it 
+                    // from the .well-known endpoint provided above. but since I am using the container name in
+                    // the above URL which is not what is published issueer by the well-known, I'm setting it here.
+                    ValidIssuer = "http://localhost:8080/auth/realms/AuthDemoRealm", 
+
                     ValidAudience = "auth-demo-web-api",
                     ValidateAudience = true,
                     ValidateLifetime = true,

diff --git a/WebApi/WebApi/WeatherForecast.cs → Api/WebApi/WeatherForecast.cs b/WebApi/WebApi/WeatherForecast.cs → Api/WebApi/WeatherForecast.cs
diff --git a/WebApi/WebApi/WebApi.csproj → Api/WebApi/WebApi.csproj b/WebApi/WebApi/WebApi.csproj → Api/WebApi/WebApi.csproj
diff --git a/WebApi/WebApi/appsettings.Development.json → Api/WebApi/appsettings.Development.json b/WebApi/WebApi/appsettings.Development.json → Api/WebApi/appsettings.Development.json
diff --git a/WebApi/WebApi/appsettings.json → Api/WebApi/appsettings.json b/WebApi/WebApi/appsettings.json → Api/WebApi/appsettings.json
diff --git a/Spa/.dockerignore b/Spa/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/Spa/dockerfile b/Spa/dockerfile
@@ -0,0 +1,13 @@
+FROM node:lts-alpine as build
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+FROM node:lts-alpine as publish
+RUN npm install -g angular-http-server
+WORKDIR /Spa
+COPY --from=build /app/dist/Spa ./
+EXPOSE 4200
+ENTRYPOINT angular-http-server -p 4200
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,4 +9,14 @@ services:
       - ./Keycloak/Volumes/deployments:/opt/jboss/keycloak/standalone/deployments
     environment:
       KEYCLOAK_USER: admin
-      KEYCLOAK_PASSWORD: admin
+      KEYCLOAK_PASSWORD: admin
+  api:
+    build:
+      context: ./Api
+    ports: 
+      - "5000:80"
+  spa:
+    build:
+      context: ./Spa
+    ports: 
+      - "4200:4200"