chore(dev): fix ovveride PM Compose deploy
This commit is contained in:
@@ -19,6 +19,11 @@
|
||||
</option>
|
||||
<option name="removeOrphansOnComposeDown" value="false" />
|
||||
<option name="commandLineOptions" value="--build" />
|
||||
<option name="secondarySourceFiles">
|
||||
<list>
|
||||
<option value="docker-compose.pm.yml" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="sourceFilePath" value="docker-compose.yml" />
|
||||
<option name="upRemoveOrphans" value="true" />
|
||||
</settings>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
|
||||
RUN mkdir -p /app/thumbnails /app/previews && chown -R $APP_UID /app
|
||||
USER $APP_UID
|
||||
WORKDIR /app
|
||||
EXPOSE 8080
|
||||
@@ -21,5 +22,5 @@ RUN dotnet publish "Lactose.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:U
|
||||
FROM base AS final
|
||||
WORKDIR /app
|
||||
COPY --from=publish /app/publish .
|
||||
RUN mkdir -p thumbnails previews
|
||||
|
||||
ENTRYPOINT ["dotnet", "Lactose.dll"]
|
||||
|
||||
@@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{773295E4-536B-4855-9E49-CA3814DAEEFF}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
docker-compose.yml = docker-compose.yml
|
||||
docker-compose.pm.yml = docker-compose.pm.yml
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lactose", "Lactose\Lactose.csproj", "{054E855F-A730-4FA4-895B-5147AF1877D9}"
|
||||
|
||||
13
docker-compose.pm.yml
Normal file
13
docker-compose.pm.yml
Normal file
@@ -0,0 +1,13 @@
|
||||
services:
|
||||
lactose:
|
||||
environment:
|
||||
- CorsAllowedOrigins=http://192.168.51.101:8080;http://milkyshot.r3d.codes
|
||||
volumes:
|
||||
- "/mnt/QBitTorrent/CosplayPhotoLib/cosplay_photo_library_v3:/diary:ro"
|
||||
|
||||
milkstream:
|
||||
environment:
|
||||
# LactoseBaseUrl must be the address the *browser* can reach Lactose at.
|
||||
# Override this with your server's hostname/IP if not running on localhost.
|
||||
#- LactoseBaseUrl=http://lactose:8080/
|
||||
- LactoseBaseUrl=http://192.168.51.101:5162/
|
||||
@@ -7,7 +7,7 @@
|
||||
context: .
|
||||
dockerfile: Lactose/Dockerfile
|
||||
environment:
|
||||
- ASPNETCORE_ENVIRONMENT=Development
|
||||
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT}
|
||||
# CorsAllowedOrigins must be the URL the *browser* uses to reach MilkStream.
|
||||
# Use semicolons to specify multiple origins (e.g. http://host1;http://host2).
|
||||
# Override this with your server's hostname/IP if not running on localhost.
|
||||
@@ -45,6 +45,8 @@
|
||||
milkstream:
|
||||
image: milkstream
|
||||
container_name: milkstream
|
||||
depends_on:
|
||||
- lactose
|
||||
build:
|
||||
context: .
|
||||
dockerfile: MilkStream/Dockerfile
|
||||
|
||||
Reference in New Issue
Block a user