Added additional env configuration options for api server. Changed the tailwind run command to use the non-interactive build
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,4 @@
|
||||
**/.idea/**
|
||||
**/data/**
|
||||
**/.env
|
||||
**/.env
|
||||
**/additional.env
|
||||
@@ -72,13 +72,13 @@ RUN dotnet nuget remove source moonlightNuget
|
||||
RUN dotnet nuget add source /src/pluginNuget -n pluginNuget
|
||||
|
||||
# Prepare moonlight for compilation
|
||||
RUN dotnet moonlight prebuild /src/Moonlight /src/pluginNuget
|
||||
RUN dotnet moonlight prebuild /src/Moonlight /src/pluginNuget
|
||||
|
||||
FROM build-plugins AS build-final
|
||||
|
||||
# Build tailwind
|
||||
WORKDIR /src/Moonlight/Moonlight.Client/Styles
|
||||
RUN npm run tailwind
|
||||
RUN npm run tailwind-build
|
||||
|
||||
# Build moonlight
|
||||
WORKDIR "/src/Moonlight/Moonlight.ApiServer"
|
||||
|
||||
@@ -22,11 +22,14 @@ services:
|
||||
- MOONLIGHT_DATABASE_DATABASE=${MOONLIGHT_DATABASE_NAME}
|
||||
- MOONLIGHT_PUBLICURL=${MOONLIGHT_URL}
|
||||
- MOONLIGHT_AUTHENTICATION_OAUTH2_ACCESSENDPOINT=http://localhost:8080/oauth2/handle # Use this when moonlight is using local oauth2 and a different port as the public url
|
||||
env_file:
|
||||
- path: "additional.env"
|
||||
required: false
|
||||
volumes:
|
||||
- ${MOONLIGHT_DATA}/moonlight:/app/storage
|
||||
links:
|
||||
- db
|
||||
pull_policy: build
|
||||
pull_policy: ${MOONLIGHT_BUILD}
|
||||
|
||||
db:
|
||||
image: postgres:latest
|
||||
|
||||
Reference in New Issue
Block a user