diff --git a/.gitattributes b/.gitattributes
index 1f09755b9f7..fd8c93e0254 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,3 +31,6 @@
 src/e2e/resources/data/*            linguist-vendored
 src/test/resources/data/*           linguist-vendored
 src/test/resources/emails/*         linguist-vendored
+
+# non-windows shell scripts should have LF line-endings (especially if copying those scripts to docker containers)
+*.sh text eol=lf
diff --git a/package.json b/package.json
index 2be3d3dbdfc..80c4a4c8949 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "lint:ts": "ng lint --tslint-config static-analysis/teammates-tslint.yml",
     "lint:json": "jsonlint-cli ./*.json src/web/**/*.json src/main/resources/*.json src/test/resources/data/*.json",
     "lint:css": "stylelint \"src/web/**/*.css\" \"src/web/**/*.scss\" \"src/web/**/*.html\" --config static-analysis/teammates-stylelint.yml",
-    "lint:spaces": "lintspaces -n -t -d spaces -l 1 -. \"src/main/**/*.html\" \"src/web/**/*.html\" \"src/**/*.xml\" \"src/**/*.json\" \"src/**/*.properties\" \"*.yml\" \"*.json\" \"*.gradle\" \"static-analysis/*.*ml\"",
+    "lint:spaces": "lintspaces -n -t -d spaces -l 1 -. \"src/main/**/*.html\" \"src/web/**/*.html\" \"src/**/*.xml\" \"src/**/*.json\" \"src/**/*.properties\" \"*.yml\" \"*.json\" \"*.gradle\" \"static-analysis/*.*ml\" \".gitattributes\"",
     "lint": "npm-run-all lint:* -c"
   },
   "private": true,