mirror of
https://github.com/jakeswenson/BitBetter.git
synced 2025-09-15 06:13:26 +00:00
Merge branch 'unified' into unified
This commit is contained in:
commit
1871df136b
|
@ -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
|
||||
|
|
2
build.sh
2
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
|
||||
|
|
|
@ -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"]
|
||||
ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"]
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user