diff --git a/build.ps1 b/build.ps1 index 37eede9..91cece8 100644 --- a/build.ps1 +++ b/build.ps1 @@ -38,7 +38,7 @@ Remove-Item "$pwd\src\bitBetter\cert.cert" -Force # gather all running instances $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}' -# stop all running instances +# stop and remove all running instances foreach ($instance in $oldinstances) { docker stop $instance docker rm $instance diff --git a/build.sh b/build.sh index 36e3ddd..232ebaf 100755 --- a/build.sh +++ b/build.sh @@ -39,7 +39,7 @@ rm -f "$PWD/src/bitBetter/cert.cert" # gather all running instances OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}') -# stop all running instances +# stop and remove all running instances for INSTANCE in ${OLDINSTANCES[@]}; do docker stop $INSTANCE docker rm $INSTANCE diff --git a/src/licenseGen/Dockerfile b/src/licenseGen/Dockerfile index 601bf87..1c8eb9b 100644 --- a/src/licenseGen/Dockerfile +++ b/src/licenseGen/Dockerfile @@ -12,4 +12,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 WORKDIR /app COPY --from=build /app . -ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"] diff --git a/src/licenseGen/Program.cs b/src/licenseGen/Program.cs index 3561455..ed22f7b 100644 --- a/src/licenseGen/Program.cs +++ b/src/licenseGen/Program.cs @@ -27,7 +27,7 @@ internal class Program { Check(); Console.WriteLine("Interactive license mode..."); - + while (licenseType == "") { Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: "); @@ -210,7 +210,7 @@ internal class Program CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)"); CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)"); CommandArgument key = config.Argument("Key", "your key id (optional)"); - + config.OnExecute(() => { Check();