Modified how buildargs are passed

- Created Dockerfile for packing up API and Web projects as Docker image

.gitignore

@@ -248,4 +248,5 @@ yarn-debug.log*
 yarn-error.log*
 .env
 Logs/*
+docker-compose.yml
 *exclude*

.woodpecker/.api_uploadimage.yaml

@@ -9,7 +9,7 @@ steps:
     commands:
       - rm -f tags.txt
       - echo ${CI_COMMIT_TAG} | sed -e "s/^APIDEV-//" >> tags.txt
-      - echo "latest-dev" >> tags.txt
+      - echo "latest-dev"
   - name: (YABA.API) Determining Docker image version number (prod)
     image: alpine:latest
     when:
@@ -17,7 +17,7 @@ steps:
     commands:
       - rm -f tags.txt
       - echo ${CI_COMMIT_TAG} | sed -e "s/^API-//" >> tags.txt
-      - echo "latest" >> tags.txt
+      - echo "latest"
   - name: (YABA.API) Package and Upload Docker Image
     image: woodpeckerci/plugin-docker-buildx
     settings:
@@ -25,8 +25,6 @@ steps:
       context: ./API
       dockerfile: ./API/YABA.API/Dockerfile
       tags_file: tags.txt
-      platforms:
-        - linux/amd64
       username:
         from_secret: gitea_yaba_registry_username
       password: 

.woodpecker/.web_uploadimage.yaml

@@ -4,23 +4,21 @@ when:
 steps:
   - name: (YABA.Web) Determining Docker image version number (dev)
     when:
-      - ref: refs/tags/WEBDEV-*
+      - refs: refs/tags/WEBDEV-*
     image: alpine:latest
     commands:
       - rm -f tags.txt
       - echo ${CI_COMMIT_TAG} | sed -e "s/^WEBDEV-//" >> tags.txt
-      - echo "latest-dev" >> tags.txt
+      - echo "latest-dev"
   - name: (YABA.Web) Determining Docker image version number (prod)
     when:
-      - ref: refs/tags/WEB-*
+      - refs: refs/tags/WEB-*
     image: alpine:latest
     commands:
       - rm -f tags.txt
       - echo ${CI_COMMIT_TAG} | sed -e "s/^WEB-//" >> tags.txt
-      - echo "latest" >> tags.txt
-  - name: (YABA.Web) Package and Upload Docker Image (dev)
-    when:
-      - ref: refs/tags/WEBDEV-*
+      - echo "latest"
+  - name: (YABA.Web) Package and Upload Docker Image
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: gitea.iwanaga.moe/cjtibule/yaba/web
@@ -32,21 +30,5 @@ steps:
       password: 
         from_secret: gitea_yaba_registry_password
       registry: gitea.iwanaga.moe
-      build_args: 
+      build_args_from_env: 
         from_secret: DEV1_BUILDARGS
-  - name: (YABA.Web) Package and Upload Docker Image (prod)
-    when:
-        - ref: refs/tags/WEB-*
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: gitea.iwanaga.moe/cjtibule/yaba/web
-      context: ./Web
-      dockerfile: ./Web/Dockerfile
-      tags_file: tags.txt
-      username:
-        from_secret: gitea_yaba_registry_username
-      password: 
-        from_secret: gitea_yaba_registry_password
-      registry: gitea.iwanaga.moe
-      build_args: 
-        from_secret: PROD_BUILDARGS

API/YABA.API/Dockerfile

@@ -6,16 +6,14 @@ EXPOSE 80
 EXPOSE 443
 
 # Set environment variables
-ENV ASPNETCORE_Environment=
+ENV ASPNETCORE_Environment=Development
 ENV ASPNETCORE_Authentication__Auth0__ClientId=
 ENV ASPNETCORE_Authentication__Auth0__ClientSecret=
 ENV ASPNETCORE_Authentication__Auth0__Domain=
 ENV ASPNETCORE_Authentication__Auth0__Identifier=
 ENV ASPNETCORE_ConnectionStrings__YABAReadOnlyDbConnectionString=
 ENV ASPNETCORE_ConnectionStrings__YABAReadWriteDbConnectionString=
-ENV WebClient__Url=
-ENV Serilog__WriteTo__1__Args__Uri=
-ENV Serilog__WriteTo__1__Args__Labels__1__Value=
+ENV ASPNETCORE_WebClient__Url=
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
 WORKDIR /src

API/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs

@@ -2,7 +2,6 @@
 using YABA.API.Extensions;
 using YABA.Common.Extensions;
 using YABA.Common.Lookups;
-using YABA.Common.Utils;
 using YABA.Service.Interfaces;
 
 namespace YABA.API.Middlewares
@@ -32,7 +31,7 @@ namespace YABA.API.Middlewares
                         userId = registedUser.Id;
                     }
 
-                    httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(EnvironmentUtils.IsDevelopmentEnvironment()), userId.ToString()));
+                    httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(), userId.ToString()));
                 }
             }
 

API/YABA.API/Program.cs

@@ -97,7 +97,7 @@ var app = builder.Build();
 // Run database migrations
 using (var scope = app.Services.CreateScope())
 {
-    var yabaDbContext = scope.ServiceProvider.GetRequiredService<YABABaseContext>();
+    var yabaDbContext = scope.ServiceProvider.GetRequiredService<YABAReadWriteContext>();
     yabaDbContext.Database.Migrate();
 }
 

API/YABA.Common/Attributes/ClaimNameAttribute.cs

@@ -4,13 +4,11 @@ namespace YABA.Common.Attributes
 {
     public class ClaimNameAttribute : Attribute
     {
-        public string DevClaimName { get; private set; }
-        public string ProdClaimName { get; private set; }
+        public string Name { get; private set; }
 
-        public ClaimNameAttribute(string devClaimName, string prodClaimName)
+        public ClaimNameAttribute(string name)
         {
-            this.DevClaimName = devClaimName;
-            ProdClaimName = prodClaimName;
+            this.Name = name;
         }
     }
 }

API/YABA.Common/Extensions/EnumExtensions.cs

@@ -28,9 +28,9 @@ namespace YABA.Common.Extensions
             return enumValue.GetAttribute<DisplayAttribute>().Name;
         }
 
-        public static string GetClaimName(this ClaimsLookup claimLookup, bool isDevelopmentEnvironment)
+        public static string GetClaimName(this ClaimsLookup claimLookup)
         {
-            return isDevelopmentEnvironment ? claimLookup.GetAttribute<ClaimNameAttribute>().DevClaimName : claimLookup.GetAttribute<ClaimNameAttribute>().ProdClaimName;
+            return claimLookup.GetAttribute<ClaimNameAttribute>().Name;
         }
 
         public static bool IsCrudResultSuccessful(this CrudResultLookup importStatusLookup) => SuccessfulCrudStatuses.Contains(importStatusLookup);

API/YABA.Common/Extensions/UserIdentityExtensions.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Security.Principal;
 using YABA.Common.Lookups;
-using YABA.Common.Utils;
 
 namespace YABA.Common.Extensions
 {
@@ -14,7 +12,7 @@ namespace YABA.Common.Extensions
         public static string GetCustomClaim(this IIdentity identity, ClaimsLookup claim)
         {
             var claimsIdentity = identity as ClaimsIdentity;
-            return claimsIdentity.FindFirst(claim.GetClaimName(EnvironmentUtils.IsDevelopmentEnvironment()))?.Value.ToString();
+            return claimsIdentity.FindFirst(claim.GetClaimName())?.Value.ToString();
         }
     }
 }

API/YABA.Common/Lookups/ClaimsLookup.cs

@@ -4,19 +4,19 @@ namespace YABA.Common.Lookups
 {
     public enum ClaimsLookup
     {
-        [ClaimName("https://auth.dev.iwanaga.moe/api/auth_provider_id", "https://auth.iwanaga.moe/api/auth_provider_id")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/auth_provider_id")]
         AuthProviderId = 1,
 
-        [ClaimName("https://auth.dev.iwanaga.moe/api/email_address", "https://auth.iwanaga.moe/api/email_address")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/email_address")]
         UserEmail = 2,
 
-        [ClaimName("https://auth.dev.iwanaga.moe/api/email_verified", "https://auth.iwanaga.moe/api/email_verified")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/email_verified")]
         IsEmailConfirmed = 3,
 
-        [ClaimName("https://auth.dev.iwanaga.moe/api/username", "https://auth.iwanaga.moe/api/username")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/username")]
         Username = 4,
 
-        [ClaimName("https://auth.dev.iwanaga.moe/api/id", "https://auth.iwanaga.moe/api/id")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/id")]
         UserId = 5
     }
 }

API/YABA.Common/Utils/EnvironmentUtils.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace YABA.Common.Utils
-{
-    public static class EnvironmentUtils
-    {
-        public static bool IsDevelopmentEnvironment() => Environment.GetEnvironmentVariable("ASPNETCORE_Environment") == "Development";
-    }
-}

Web/nginx.conf

@@ -1,5 +1,6 @@
 server {
   listen 80;
+  server_name localhost;
   root /usr/share/nginx/html;
   index index.html;
   location / {

Web/package.json

@@ -2,6 +2,7 @@
   "name": "yaba-web",
   "version": "0.1.0",
   "private": true,
+  "homepage": ".",
   "dependencies": {
     "@auth0/auth0-react": "^2.0.0",
     "@testing-library/jest-dom": "^5.16.5",

docker-compose.yaml

@@ -1,38 +0,0 @@
-version: "3"
-services:
-  web:
-    build:
-      context: ./Web
-      dockerfile: Dockerfile
-      args:
-        REACT_APP_API_BASE_URL: http://localhost:32270/api
-        REACT_APP_AUTH0_DOMAIN: iwanaga-dev.us.auth0.com
-        REACT_APP_AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
-        REACT_APP_AUTH0_CALLBACK_URL: http://localhost:32271/redirect
-        REACT_APP_AUTH0_AUDIENCE: https://yaba.dev.iwanaga.moe
-    container_name: yaba_web
-    restart: unless-stopped
-    ports:
-      - 32271:80
-    depends_on:
-      - api
-  api:
-    build:
-      context: ./API
-      dockerfile: YABA.API/Dockerfile
-      args:
-        MODE: Debug
-    container_name: yaba_api
-    ports:
-      - 32270:80
-    environment:
-      ASPNETCORE_Environment: Development
-      ASPNETCORE_Authentication__Auth0__ClientId: ${AUTH0_CLIENT_ID}
-      ASPNETCORE_Authentication__Auth0__ClientSecret: ${AUTH0_CLIENT_SECRET}
-      ASPNETCORE_Authentication__Auth0__Domain: iwanaga-dev.us.auth0.com
-      ASPNETCORE_Authentication__Auth0__Identifier: https://yaba.dev.iwanaga.moe
-      ASPNETCORE_ConnectionStrings__YABAReadOnlyDbConnectionString: ${RO_CONNECTION_STRING}
-      ASPNETCORE_ConnectionStrings__YABAReadWriteDbConnectionString: ${RW_CONNECTION_STRING}
-      WebClient__Url: http://localhost:32271
-      Serilog__WriteTo__1__Args__Uri: https://loki.iwanaga.moe
-      Serilog__WriteTo__1__Args__Labels__1__Value: localhost