Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

formatting on run script

Browse Source
This commit is contained in:
Kyle Spearrin 2018-05-31 13:49:41 -04:00
parent 4d33b3e1da
commit 5f002a20f1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/run.sh
View File

@ -31,7 +31,7 @@ OS="lin"
ENV_DIR="$OUTPUT_DIR/env" ENV_DIR="$OUTPUT_DIR/env"
DOCKER_DIR="$OUTPUT_DIR/docker" DOCKER_DIR="$OUTPUT_DIR/docker"
# Initialize UID/GID which will be used to run services identically over all the OS... # Initialize UID/GID which will be used to run services from within containers
if ! grep -q "^LOCAL_UID=" $ENV_DIR/uid.env 2>/dev/null || ! grep -q "^LOCAL_GID=" $ENV_DIR/uid.env 2>/dev/null if ! grep -q "^LOCAL_UID=" $ENV_DIR/uid.env 2>/dev/null || ! grep -q "^LOCAL_GID=" $ENV_DIR/uid.env 2>/dev/null
then then
LUID="LOCAL_UID=`id -u $USER`" LUID="LOCAL_UID=`id -u $USER`"
@ -43,7 +43,7 @@ then
echo $LGID >>$ENV_DIR/uid.env echo $LGID >>$ENV_DIR/uid.env
fi fi
# ... but up to Core version 1.19.0, keep the old behavior for backward compatibility # Backwards compat GID/UID for pre-1.20.0 installations
if [[ "$COREVERSION" == *.*.* ]] && if [[ "$COREVERSION" == *.*.* ]] &&
echo -e "1.19.0\n$COREVERSION" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -n | awk 'END {if($0!="1.19.0") {exit 1}}' echo -e "1.19.0\n$COREVERSION" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -n | awk 'END {if($0!="1.19.0") {exit 1}}'
then then
@ -86,14 +86,16 @@ function install() {
mkdir -p $OUTPUT_DIR/letsencrypt mkdir -p $OUTPUT_DIR/letsencrypt
docker pull certbot/certbot docker pull certbot/certbot
docker run -it --rm --name certbot -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \ docker run -it --rm --name certbot -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \
certonly --standalone --noninteractive --agree-tos --preferred-challenges http --email $EMAIL -d $DOMAIN \ certonly --standalone --noninteractive --agree-tos --preferred-challenges http \
--logs-dir /etc/letsencrypt/logs --email $EMAIL -d $DOMAIN --logs-dir /etc/letsencrypt/logs
fi fi
fi fi
pullSetup pullSetup
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \ docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS \
-corev $COREVERSION -webv $WEBVERSION
echo "" echo ""
echo "Setup complete" echo "Setup complete"