.pre-commit-config.yaml

@@ -21,3 +21,4 @@ repos:
   rev: v2.12.0
   hooks:
   - id: hadolint-docker
+    args: [--ignore, SC2086]

Server/Dockerfile

@@ -7,17 +7,16 @@ ENV TZ=Etc/UTC
 ENV DOTNET_TieredPGO=1
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-RUN echo "Target: $TARGETARCH"
+RUN echo "Target: $TARGETARCH" && echo "Build: $BUILDPLATFORM"
-RUN echo "Build: $BUILDPLATFORM"
 WORKDIR /src
 COPY ["Wonderking/Wonderking.csproj", "Wonderking/"]
 COPY ["Server/Server.csproj", "Server/"]
-RUN dotnet restore "Wonderking/Wonderking.csproj" -a $TARGETARCH
+RUN dotnet restore "Wonderking/Wonderking.csproj" -a $TARGETARCH && dotnet restore "Server/Server.csproj" -a $TARGETARCH
-RUN dotnet restore "Server/Server.csproj" -a $TARGETARCH
 COPY . .
 
 FROM build AS publish
 RUN dotnet publish "Server/Server.csproj" -c Release -a $TARGETARCH --no-restore -f net8.0 -o /app
+COPY ../config /app/config
 
 FROM base AS final
 WORKDIR /app

Server/docker-compose.yml

@@ -1,4 +1,4 @@
-services:
+services:
   server:
     container_name: continuity-server
     image: continuity:latest
@@ -16,12 +16,20 @@
     networks:
     - continuity
     ports:
-      - "10001:10001"
+    - 10001:10001
     volumes:
     - type: bind
       source: ../wk-data
       target: /app/data
       read_only: true
+    - type: bind
+      source: ../wk-logs
+      target: /app/logs
+      read_only: false
+    - type: bind
+      source: ../config
+      target: /app/config
+      read_only: true
 
   db:
     container_name: continuity-db
@@ -34,11 +42,11 @@
     networks:
     - continuity
     ports:
-      - "5432:5432"
+    - 5432:5432
     volumes:
     - db-data:/var/lib/postgresql/data
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}" ]
+      test: [CMD-SHELL, 'pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}']
       interval: 10s
       timeout: 3s
       retries: 3