Skip to content

Commit

Permalink
Replace spaces with tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
Bitbucket Pipelines Agent committed Jan 17, 2017
1 parent ecbbc49 commit 90401bf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions bin/build-env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ echo "Configuring build settings..."
BRANCH_NAME_SAFE="$(echo -n $BITBUCKET_BRANCH | sed -e 's/[^A-Za-z0-9]/-/g' | awk '{print tolower($0)}')"
# Trim the branch name if longer than BRANCH_NAME_LENGTH_LIMIT and append the md5sum to keep the branch name unique
if (( "${#BRANCH_NAME_SAFE}" > "$BRANCH_NAME_LENGTH_LIMIT" )); then
BRANCH_NAME_SAFE="$(echo -n $BRANCH_NAME_SAFE | cut -c1-30)-$(echo -n $BRANCH_NAME_SAFE | md5sum | cut -c1-4)"
BRANCH_NAME_SAFE="$(echo -n $BRANCH_NAME_SAFE | cut -c1-30)-$(echo -n $BRANCH_NAME_SAFE | md5sum | cut -c1-4)"
fi

# Trim repo slug to 30 characters. If someone has a repo name longer than that, then no mercy for them.
Expand All @@ -30,9 +30,9 @@ echo "Configuring ssh access..."

# Use DOCKER_HOST (domain name) if set, otherwise use DOCKER_HOST_IP (IP)
if [[ $DOCKER_HOST != "" ]]; then
sed -i "s/DOCKER_HOST/$DOCKER_HOST/g" $HOME/.ssh/config
sed -i "s/DOCKER_HOST/$DOCKER_HOST/g" $HOME/.ssh/config
else
sed -i "s/DOCKER_HOST/$DOCKER_HOST_IP/g" $HOME/.ssh/config
sed -i "s/DOCKER_HOST/$DOCKER_HOST_IP/g" $HOME/.ssh/config
fi

# Configure git
Expand Down
4 changes: 2 additions & 2 deletions bin/build-init
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ ssh docker-host "cd $REMOTE_BUILD_DIR && echo COMPOSE_PROJECT_NAME=$COMPOSE_PROJ
ssh docker-host "cd $REMOTE_BUILD_DIR && echo VIRTUAL_HOST=$DOMAIN | tee -a .docksal/docksal-local.env"
# Basic HTTP Auth
if [[ $HTTP_USER != "" ]] && [[ $HTTP_PASS != "" ]]; then
ssh docker-host "cd $REMOTE_BUILD_DIR && echo APACHE_BASIC_AUTH_USER=$HTTP_USER | tee -a .docksal/docksal-local.env"
ssh docker-host "cd $REMOTE_BUILD_DIR && echo APACHE_BASIC_AUTH_PASS=$HTTP_PASS | tee -a .docksal/docksal-local.env"
ssh docker-host "cd $REMOTE_BUILD_DIR && echo APACHE_BASIC_AUTH_USER=$HTTP_USER | tee -a .docksal/docksal-local.env"
ssh docker-host "cd $REMOTE_BUILD_DIR && echo APACHE_BASIC_AUTH_PASS=$HTTP_PASS | tee -a .docksal/docksal-local.env"
fi
#echo "Launching fin init..."
#ssh docker-host "cd $REMOTE_BUILD_DIR && fin init"
2 changes: 1 addition & 1 deletion config/.ssh/config
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Host docker-host
StrictHostKeyChecking no
UserKnownHostsFile=/dev/null
LogLevel ERROR
IdentityFile ~/.ssh/docker_host_id_rsa
IdentityFile ~/.ssh/docker_host_id_rsa

0 comments on commit 90401bf

Please sign in to comment.