Feat/upgradePackages

.gitignore

@@ -286,4 +286,8 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
-.DS_Store
+.DS_Store
+
+# ignore generated certs
+**/localhost.crt
+**/localhost.key

accounts-api-seed/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 
 RUN dotnet tool update --global dotnet-ef
 WORKDIR /src

accounts-api/src/WebApi/Dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 COPY ["src/WebApi/WebApi.csproj", "src/WebApi/"]
 COPY ["src/Application/Application.csproj", "src/Application/"]

accounts-api/src/WebApi/appsettings.Development.json

@@ -22,7 +22,7 @@
         "SQLServer": true
     },
     "PersistenceModule": {
-        "DefaultConnection": "Server=localhost;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;"
+        "DefaultConnection": "Server=localhost;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;TrustServerCertificate=true;"
     },
     "AuthenticationModule": {
         "AuthorityUrl": "https://wallet.local/identity-server"

docker-compose/docker-compose.backend-only.yml

@@ -56,5 +56,6 @@ services:
     environment:
       SA_PASSWORD: "<YourStrong!Passw0rd>"
       ACCEPT_EULA: "Y"
+      MSSQL_PID: "Developer"
     ports:
       - "1433:1433"

docker-compose/docker-compose.yml

@@ -6,8 +6,8 @@ services:
       context: ../nginx/
     container_name: wallet.local
     volumes:
-      - ../.docker/https/localhost.crt:/etc/ssl/certs/localhost.crt:ro
-      - ../.docker/https/localhost.key:/etc/ssl/private/localhost.key:ro
+      - ../docker-compose/https/localhost.crt:/etc/ssl/certs/localhost.crt:ro
+      - ../docker-compose/https/localhost.key:/etc/ssl/private/localhost.key:ro
     links:
       - accounts-api
       - identity-server
@@ -24,9 +24,9 @@ services:
       - ASPNETCORE_BASEPATH=/accounts-api
       - ASPNETCORE_Kestrel__Certificates__Default__Password=MyCertificatePassword
       - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/localhost.pfx
-      - PersistenceModule__DefaultConnection=Server=sql1;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;
+      - PersistenceModule__DefaultConnection=Server=sql1;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;TrustServerCertificate=true;
     volumes:
-      - ../.docker/https:/https:ro
+      - ../docker-compose/https:/https:ro
     depends_on:
       - sql1
       - accounts-api-seed
@@ -37,7 +37,7 @@ services:
       context: ../accounts-api/
       dockerfile: ../accounts-api-seed/Dockerfile
     environment:
-      - PersistenceModule__DefaultConnection=Server=sql1;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;
+      - PersistenceModule__DefaultConnection=Server=sql1;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;TrustServerCertificate=true;
     command: bash -c "/root/.dotnet/tools/dotnet-ef database update --project src/Infrastructure --startup-project src/WebApi"
     depends_on:
       - sql1
@@ -51,7 +51,7 @@ services:
       - ASPNETCORE_Kestrel__Certificates__Default__Password=MyCertificatePassword
       - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/localhost.pfx
     volumes:
-      - ../.docker/https:/https:ro
+      - ../docker-compose/https:/https:ro
     build:
       context: ../
       dockerfile: identity-server/Dockerfile
@@ -63,9 +63,10 @@ services:
     build:
       context: ../wallet-spa/
   sql1:
-    image: "mcr.microsoft.com/mssql/server:2019-latest"
+    image: "mcr.microsoft.com/mssql/server:2022-latest"
     environment:
-      SA_PASSWORD: "<YourStrong!Passw0rd>"
+      MSSQL_SA_PASSWORD: "<YourStrong!Passw0rd>"
       ACCEPT_EULA: "Y"
+      MSSQL_PID: "Developer"
     ports:
       - "1433:1433"

identity-server/Dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 COPY ["identity-server/IdentityServer.csproj", "identity-server/"]
 RUN dotnet restore "identity-server/IdentityServer.csproj"

wallet-spa/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:9-alpine
+FROM node:18-alpine
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -10,7 +10,7 @@ ENV ENV ${ENV}
 # --no-cache: download package index on-the-fly, no need to cleanup afterwards
 # --virtual: bundle packages, remove whole bundle at once, when done
 RUN apk --no-cache --virtual build-dependencies add \
-    python \
+    py3-pip \
     make \
     g++ \
     && npm install \