Merge pull request #19 from MarvinMenzerath/develop

v2.1.0
menzerath · Jan 3, 2016 · 13af73c · 13af73c
2 parents ba491de + 6a0f5a9
commit 13af73c
Show file tree

Hide file tree

Showing 50 changed files with 3,828 additions and 1,103 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,11 @@
+# Git
+.git/
+
+# IDE (IntelliJ IDEA)
+.idea/
+UpAndRunning2.iml
+
+# Application
+config/local*.json
+doc/
+README.md
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,4 @@ _testmain.go
 UpAndRunning2.iml
 
 # Application
-config/local.json
+config/local*.json
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine:3.3
+MAINTAINER Marvin Menzerath <github@marvin-menzerath.de>
+
+ENV UAR2_IS_DOCKER true
+
+WORKDIR /app/upandrunning2/
+COPY . /app/upandrunning2/
+RUN chmod +x ./docker/build.sh && sync && ./docker/build.sh
+
+EXPOSE 8080
+ENTRYPOINT ["./UpAndRunning2"]