Set default git settings

Closes #124
docksal · Sep 16, 2019 · 880cae5 · 880cae5
1 parent 7355039
commit 880cae5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/7.1/startup.sh b/7.1/startup.sh
@@ -106,8 +106,10 @@ git_settings ()
 {
 	# These must be run as the docker user
 	echo-debug "Configuring git..."
-	gosu docker git config --global user.email "${GIT_USER_EMAIL}"
-	gosu docker git config --global user.name "${GIT_USER_NAME}"
+	# Set default git settings if none have been passed
+	# See https://github.com/docksal/service-cli/issues/124
+	gosu docker git config --global user.email "${GIT_USER_EMAIL:-cli@docksal.io}"
+	gosu docker git config --global user.name "${GIT_USER_NAME:-Docksal CLI}"
 }
 
 # Inject a private SSH key if provided

diff --git a/7.2/startup.sh b/7.2/startup.sh
@@ -106,8 +106,10 @@ git_settings ()
 {
 	# These must be run as the docker user
 	echo-debug "Configuring git..."
-	gosu docker git config --global user.email "${GIT_USER_EMAIL}"
-	gosu docker git config --global user.name "${GIT_USER_NAME}"
+	# Set default git settings if none have been passed
+	# See https://github.com/docksal/service-cli/issues/124
+	gosu docker git config --global user.email "${GIT_USER_EMAIL:-cli@docksal.io}"
+	gosu docker git config --global user.name "${GIT_USER_NAME:-Docksal CLI}"
 }
 
 # Inject a private SSH key if provided

diff --git a/7.3/startup.sh b/7.3/startup.sh
@@ -106,8 +106,10 @@ git_settings ()
 {
 	# These must be run as the docker user
 	echo-debug "Configuring git..."
-	gosu docker git config --global user.email "${GIT_USER_EMAIL}"
-	gosu docker git config --global user.name "${GIT_USER_NAME}"
+	# Set default git settings if none have been passed
+	# See https://github.com/docksal/service-cli/issues/124
+	gosu docker git config --global user.email "${GIT_USER_EMAIL:-cli@docksal.io}"
+	gosu docker git config --global user.name "${GIT_USER_NAME:-Docksal CLI}"
 }
 
 # Inject a private SSH key if provided