rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updates the docker files to use the new nuget stuff and moves around the ENV values

Browse source 
- if the build fails I will be rolling back these changes to before nuget
This commit is contained in:
Madpeter 2020-05-01 20:56:50 +01:00
parent 50b1a07de3
commit 63968b705e
2 changed files with 46 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CLI/Dockerfile-ForDebug
View file

@ -8,9 +8,6 @@ WORKDIR /src
COPY ["CLI/BetterSecondBot.csproj", "CLI/"] COPY ["CLI/BetterSecondBot.csproj", "CLI/"]
COPY ["Core/BSB.csproj", "Core/"] COPY ["Core/BSB.csproj", "Core/"]
COPY ["BSBshared/BSBshared.csproj", "BSBshared/"] COPY ["BSBshared/BSBshared.csproj", "BSBshared/"]
COPY ["libremetaverse-core/Libremetaversetypes/LibreMetaverse.Types.csproj", "libremetaverse-core/Libremetaversetypes/"]
COPY ["libremetaverse-core/Libremetaverse/LibreMetaverse.csproj", "libremetaverse-core/Libremetaverse/"]
COPY ["libremetaverse-core/Libremetaverse.structureddata/LibreMetaverse.StructuredData.csproj", "libremetaverse-core/Libremetaverse.structureddata/"]
RUN dotnet restore "CLI/BetterSecondBot.csproj" RUN dotnet restore "CLI/BetterSecondBot.csproj"
COPY . . COPY . .
WORKDIR "/src/CLI" WORKDIR "/src/CLI"
@ -22,18 +19,14 @@ RUN dotnet publish "BetterSecondBot.csproj" -c DockerBuild -o /app/publish
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENV BotRunningInDocker='REQUIRED'
EXPOSE 8080
ENV ASPNETCORE_URLS http://+:8080
# --- Update your settings --- # --- Update your settings ---
# Required # Required
ENV string userName='' ENV userName=''
ENV string password='' ENV password=''
ENV string master='' ENV master=''
ENV string code='' ENV code=''
# Mixed # Mixed
ENV allowRLV='False' ENV allowRLV='False'
@ -65,4 +58,8 @@ ENV HttpAsCnC='False'
# --- End of settings --- # --- End of settings ---
ENV BotRunningInDocker='REQUIRED'
EXPOSE 8080
ENV ASPNETCORE_URLS http://+:8080
ENTRYPOINT ["dotnet", "BetterSecondBot.dll"] ENTRYPOINT ["dotnet", "BetterSecondBot.dll"]

61
Dockerfile
View file

@ -8,9 +8,6 @@ WORKDIR /src
COPY ["CLI/BetterSecondBot.csproj", "CLI/"] COPY ["CLI/BetterSecondBot.csproj", "CLI/"]
COPY ["Core/BSB.csproj", "Core/"] COPY ["Core/BSB.csproj", "Core/"]
COPY ["BSBshared/BSBshared.csproj", "BSBshared/"] COPY ["BSBshared/BSBshared.csproj", "BSBshared/"]
COPY ["libremetaverse-core/Libremetaversetypes/LibreMetaverse.Types.csproj", "libremetaverse-core/Libremetaversetypes/"]
COPY ["libremetaverse-core/Libremetaverse/LibreMetaverse.csproj", "libremetaverse-core/Libremetaverse/"]
COPY ["libremetaverse-core/Libremetaverse.structureddata/LibreMetaverse.StructuredData.csproj", "libremetaverse-core/Libremetaverse.structureddata/"]
RUN dotnet restore "CLI/BetterSecondBot.csproj" RUN dotnet restore "CLI/BetterSecondBot.csproj"
COPY . . COPY . .
WORKDIR "/src/CLI" WORKDIR "/src/CLI"
@ -23,27 +20,45 @@ FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENV BotRunningInDocker='REQUIRED' # --- Update your settings ---
ENV userName='Firstname LastName'
ENV password='PassWord'
ENV master='Madpeter Zond'
ENV code='DontTellAnyoneThis'
ENV discord='https://discordapp.com/api/webhooks/XXXX/YYYY'
ENV discordGroupTarget='00000000-0000-0000-0000-000000000000'
ENV allowRLV='false'
ENV homeRegion='"SLurl1","SLurl2"'
ENV EnableHttp='false'
ENV Httpport='80'
ENV Httpkey='ThisIsAKeyYo'
ENV HttpRequireSigned='false'
ENV HttpHost='http://localhost'
ENV HttpAsCnC='false'
ENV DiscordFullServer='false'
ENV DiscordClientToken='https://discordapp.com/developers/ Bot'
ENV DiscordServerID='1234567890'
ENV DiscordServerImHistoryHours='24'
ENV DefaultSitUUID='00000000-0000-0000-0000-000000000000'
# Required
ENV userName=''
ENV password=''
ENV master=''
ENV code=''
# Mixed
ENV allowRLV='False'
ENV DefaultSitUUID='00000000-0000-0000-0000-000000000000'
ENV CommandsToConsole='True'
ENV MaxCommandHistory='250'
ENV RelayImToAvatar='00000000-0000-0000-0000-000000000000'
# Discord
ENV discordWebhookURL=''
ENV discordGroupTarget='00000000-0000-0000-0000-000000000000'
ENV DiscordFullServer='False'
ENV DiscordClientToken=''
ENV DiscordServerID=''
ENV DiscordServerImHistoryHours='24'
# @home
ENV homeRegion=''
ENV AtHomeSimOnly='False'
ENV AtHomeSimPosMaxRange='10.0'
# HTTPinterface
ENV EnableHttp='False'
ENV Httpport='8080'
ENV Httpkey=''
ENV HttpRequireSigned='True'
ENV HttpHost='http://localhost'
ENV HttpAsCnC='False'
# --- End of settings ---
ENV BotRunningInDocker='REQUIRED'
EXPOSE 8080 EXPOSE 8080
ENV ASPNETCORE_URLS http://+:8080 ENV ASPNETCORE_URLS http://+:8080