Another update for line endings on Windows

Cervator · Sep 1, 2018 · 4e41c4b · 4e41c4b
1 parent f63e261
commit 4e41c4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -2,5 +2,8 @@
 secure/* filter=crypt diff=crypt
 
 *.sh text eol=lf
+jenkins-support text eol=lf
+plugins.txt text eol=lf
+Dockerfile text eol=lf
 gradlew text eol=lf
 groovyw text eol=lf
diff --git a/Vagrantfile b/Vagrantfile
@@ -18,7 +18,7 @@ Vagrant.configure("2") do |config|
     curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     apt-get update
-    apt-get install -y docker-ce
+    apt-get install -y docker-ce dos2unix
 
     curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
     chmod +x /usr/local/bin/docker-compose