From 6641290290306e5e2ea7b8c7567c3cd23c2416ca Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 27 Mar 2018 15:04:13 -0400 Subject: [PATCH] no need to create env file --- scripts/run.sh | 12 ++++++++---- util/Setup/EnvironmentFileBuilder.cs | 3 --- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/run.sh b/scripts/run.sh index 4ce9e2f559..abfd321dbf 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -93,10 +93,12 @@ function update() { pullSetup if [ $OS == "lin" ] then - docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION -e LOCAL_UID=`id -u $USER` \ + docker run -i --rm --name setup \ + -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION -e LOCAL_UID=`id -u $USER` \ dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION else - docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \ + docker run -i --rm --name setup \ + -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \ dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION fi } @@ -105,10 +107,12 @@ function printEnvironment() { pullSetup if [ $OS == "lin" ] then - docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION -e LOCAL_UID=`id -u $USER` \ + docker run -i --rm --name setup \ + -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION -e LOCAL_UID=`id -u $USER` \ dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION else - docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \ + docker run -i --rm --name setup \ + -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \ dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION fi } diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs index 1b8f04e71e..7d5f30c272 100644 --- a/util/Setup/EnvironmentFileBuilder.cs +++ b/util/Setup/EnvironmentFileBuilder.cs @@ -164,9 +164,6 @@ SA_PASSWORD=SECRET } Helpers.Exec("chmod 600 /bitwarden/env/mssql.override.env"); - - using(var sw = File.CreateText("/bitwarden/env/uid.env")) - { } } } }