diff --git a/CLI/Dockerfile-ForDebug b/CLI/Dockerfile-ForDebug index 631be2f..3e12745 100644 --- a/CLI/Dockerfile-ForDebug +++ b/CLI/Dockerfile-ForDebug @@ -8,9 +8,6 @@ WORKDIR /src COPY ["CLI/BetterSecondBot.csproj", "CLI/"] COPY ["Core/BSB.csproj", "Core/"] 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" COPY . . WORKDIR "/src/CLI" @@ -22,18 +19,14 @@ RUN dotnet publish "BetterSecondBot.csproj" -c DockerBuild -o /app/publish FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENV BotRunningInDocker='REQUIRED' -EXPOSE 8080 -ENV ASPNETCORE_URLS http://+:8080 - # --- Update your settings --- # Required -ENV string userName='' -ENV string password='' -ENV string master='' -ENV string code='' +ENV userName='' +ENV password='' +ENV master='' +ENV code='' # Mixed ENV allowRLV='False' @@ -65,4 +58,8 @@ ENV HttpAsCnC='False' # --- End of settings --- +ENV BotRunningInDocker='REQUIRED' +EXPOSE 8080 +ENV ASPNETCORE_URLS http://+:8080 + ENTRYPOINT ["dotnet", "BetterSecondBot.dll"] \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 95d013b..1f18889 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,6 @@ WORKDIR /src COPY ["CLI/BetterSecondBot.csproj", "CLI/"] COPY ["Core/BSB.csproj", "Core/"] 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" COPY . . WORKDIR "/src/CLI" @@ -23,27 +20,45 @@ FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENV BotRunningInDocker='REQUIRED' -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' +# --- Update your settings --- +# 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 ENV ASPNETCORE_URLS http://+:8080