Skip to content

Commit

Permalink
Updated Dockerfiles to .net 8
Browse files Browse the repository at this point in the history
  • Loading branch information
sven-n committed Nov 17, 2023
1 parent ee6b553 commit 8543f65
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 45 deletions.
2 changes: 1 addition & 1 deletion deploy/all-in-one/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
dockerfile: Startup/Dockerfile
restart: "no"
ports:
- "81:80"
- "8081:8080"

database:
ports:
Expand Down
3 changes: 2 additions & 1 deletion deploy/all-in-one/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ services:
image: munique/openmu
container_name: openmu-startup
ports:
- "80"
- "8080"
- "55901:55901"
- "55902:55902"
- "55903:55903"
- "44405:44405"
- "55980:55980"
environment:
DB_HOST: database
ASPNETCORE_URLS: http://+:8080
working_dir: /app/
volumes:
- ./.htpasswd:/etc/nginx/.htpasswd
Expand Down
2 changes: 1 addition & 1 deletion deploy/all-in-one/nginx.prod443.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ http {
resolver 127.0.0.11 ipv6=off;

location / {
proxy_pass http://openmu-startup;
proxy_pass http://openmu-startup:8080;
}
}
}
6 changes: 3 additions & 3 deletions deploy/distributed/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ services:
environment:
ASPNETCORE_ENVIRONMENT: Development
ports:
- "81:80"
- "81:8080"

gameServer1:
environment:
ASPNETCORE_ENVIRONMENT: Development
ports:
- "82:80"
- "82:8080"

connectServer:
build:
Expand Down Expand Up @@ -69,4 +69,4 @@ services:
environment:
ASPNETCORE_ENVIRONMENT: Development
ports:
- "88:80"
- "88:8080"
34 changes: 22 additions & 12 deletions deploy/distributed/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ services:
- "9464" # Prometheus
environment:
APPID: connectServer
ASPNETCORE_URLS: http://+:8080
depends_on:
- pubsub
- zipkin
Expand All @@ -132,7 +133,7 @@ services:
connectServer-dapr:
image: "daprio/daprd:latest"
container_name: connectServer_dapr
command: [ "./daprd", "-app-id", "connectServer", "-app-port", "80",
command: [ "./daprd", "-app-id", "connectServer", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -148,14 +149,16 @@ services:
ports:
- "50001"
- "9464" # Prometheus
environment:
ASPNETCORE_URLS: http://+:8080
depends_on:
- zipkin
- database

loginServer-dapr:
image: "daprio/daprd:latest"
container_name: loginServer_dapr
command: [ "./daprd", "-app-id", "loginServer", "-app-port", "80",
command: [ "./daprd", "-app-id", "loginServer", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -171,6 +174,8 @@ services:
ports:
- "50001"
- "9464" # Prometheus
environment:
ASPNETCORE_URLS: http://+:8080
depends_on:
- chatServer-dapr
- database
Expand All @@ -179,7 +184,7 @@ services:
friendServer-dapr:
image: "daprio/daprd:latest"
container_name: friendServer_dapr
command: [ "./daprd", "-app-id", "friendServer", "-app-port", "80",
command: [ "./daprd", "-app-id", "friendServer", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -195,14 +200,16 @@ services:
ports:
- "50001"
- "9464" # Prometheus
environment:
ASPNETCORE_URLS: http://+:8080
depends_on:
- database
- zipkin

guildServer-dapr:
image: "daprio/daprd:latest"
container_name: guildServer_dapr
command: [ "./daprd", "-app-id", "guildServer", "-app-port", "80",
command: [ "./daprd", "-app-id", "guildServer", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -217,6 +224,7 @@ services:
container_name: chatServer
environment:
APPID: chatServer
ASPNETCORE_URLS: http://+:8080
ports:
- "55980:55980"
- "50001"
Expand All @@ -228,7 +236,7 @@ services:
chatServer-dapr:
image: "daprio/daprd:latest"
container_name: chatServer_dapr
command: [ "./daprd", "-app-id", "chatServer", "-app-port", "80",
command: [ "./daprd", "-app-id", "chatServer", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -245,18 +253,18 @@ services:
depends_on:
- database
ports:
- "80"
- "8080"
- "9464" # Prometheus
environment:
ASPNETCORE_URLS: http://+:80
ASPNETCORE_URLS: http://+:8080
PATH_BASE: /admin/
volumes:
- ./.htpasswd:/etc/nginx/.htpasswd

adminPanel-dapr:
image: "daprio/daprd:latest"
container_name: adminPanel_dapr
command: [ "./daprd", "-app-id", "adminPanel", "-app-port", "80",
command: [ "./daprd", "-app-id", "adminPanel", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -274,14 +282,15 @@ services:
context: ../../src
dockerfile: Dapr/GameServer.Host/Dockerfile
ports:
- "80"
- "8080"
- "50001"
- "55901:55901"
- "9464" # Prometheus
environment:
GS_ID: 0
APPID: gameServer0
PATH_BASE: /gameServer/0/
ASPNETCORE_URLS: http://+:8080
depends_on:
- connectServer-dapr
- loginServer-dapr
Expand All @@ -294,7 +303,7 @@ services:
gameServer0-dapr:
image: "daprio/daprd:latest"
container_name: gameserver0_dapr
command: [ "./daprd", "-app-id", "gameServer0", "-app-port", "80",
command: [ "./daprd", "-app-id", "gameServer0", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand All @@ -311,14 +320,15 @@ services:
context: ../../src
dockerfile: Dapr/GameServer.Host/Dockerfile
ports:
- "80"
- "8080"
- "50001"
- "55902:55902"
- "9464" # Prometheus
environment:
GS_ID: 1
APPID: gameServer1
PATH_BASE: /gameServer/1/
ASPNETCORE_URLS: http://+:8080
depends_on:
- connectServer-dapr
- loginServer-dapr
Expand All @@ -331,7 +341,7 @@ services:
gameServer1-dapr:
image: "daprio/daprd:latest"
container_name: gameserver1_dapr
command: [ "./daprd", "-app-id", "gameServer1", "-app-port", "80",
command: [ "./daprd", "-app-id", "gameServer1", "-app-port", "8080",
"-components-path", "/components",
"-config", "/components/config.yaml",
"-placement-host-address", "dapr-placement:50006" ]
Expand Down
6 changes: 3 additions & 3 deletions deploy/distributed/nginx.prod443.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@ http {
}

location ~ (/admin)(.*) {
proxy_pass http://adminPanel/admin$2;
proxy_pass http://adminPanel:8080/admin$2;
}

# Public API
location ~ (/serverInfo)(.*) {
proxy_pass http://connectServer/serverInfo$2;
proxy_pass http://connectServer:8080/serverInfo$2;
auth_basic off;
}

# Game Servers:
location ~ (/gameServer/(\d+)(.*)) {
proxy_pass http://gameServer$2$1;
proxy_pass http://gameServer:8080$2$1;
}
}
}
6 changes: 3 additions & 3 deletions src/Dapr/AdminPanel.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj", "Dapr/AdminPanel.Host/"]
RUN dotnet restore "Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr/ChatServer.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080
EXPOSE 55980

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj", "Dapr/ChatServer.Host/"]
RUN dotnet restore "Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr/ConnectServer.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080
EXPOSE 44405

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj", "Dapr/ConnectServer.Host/"]
RUN dotnet restore "Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr/FriendServer.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj", "Dapr/FriendServer.Host/"]
RUN dotnet restore "Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr/GameServer.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj", "Dapr/GameServer.Host/"]
RUN dotnet restore "Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr/GuildServer.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj", "Dapr/GuildServer.Host/"]
RUN dotnet restore "Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr/LoginServer.Host/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj", "Dapr/LoginServer.Host/"]
RUN dotnet restore "Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj"
Expand Down
6 changes: 3 additions & 3 deletions src/Startup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 8080
EXPOSE 55901
EXPOSE 55902
EXPOSE 55903
EXPOSE 44405
EXPOSE 55980

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["Startup/MUnique.OpenMU.Startup.csproj", "Startup/"]
RUN dotnet restore "Startup/MUnique.OpenMU.Startup.csproj"
Expand Down

0 comments on commit 8543f65

Please sign in to comment.