Merge pull request #112 from TheConnMan/enhancement/docker-compose

Docker Compose
streamaserver · Jan 2, 2016 · 5fa9c75 · 5fa9c75
2 parents 7f6f6fc + fbb7134
commit 5fa9c75
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 166 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,26 @@
+FROM java:8-jdk
+
+WORKDIR /usr/lib/java
+
+ENV GRAILS_VERSION 2.4.4
+
+RUN wget https://github.com/grails/grails-core/releases/download/v${GRAILS_VERSION}/grails-${GRAILS_VERSION}.zip
+RUN unzip grails-${GRAILS_VERSION}.zip
+RUN rm -rf grails-${GRAILS_VERSION}.zip
+RUN ln -s grails-${GRAILS_VERSION} grails
+
+ENV GRAILS_HOME /usr/lib/java/grails
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV PATH $GRAILS_HOME/bin:$PATH
+
+RUN mkdir /app
+COPY . /app
+WORKDIR /app
+
+RUN grails compile
+
+EXPOSE 8080
+
+ENTRYPOINT ["grails"]
+
+CMD ["-Dgrails.env=docker", "run-app"]
diff --git a/Dockerfile/tomcat/Dockerfile b/Dockerfile/tomcat/Dockerfile
diff --git a/Dockerfile/tomcat/bin/setenv.sh b/Dockerfile/tomcat/bin/setenv.sh
diff --git a/Dockerfile/tomcat/conf/server.xml b/Dockerfile/tomcat/conf/server.xml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,14 @@
+db:
+  image: mysql:latest
+  environment:
+    - MYSQL_DATABASE=streama
+    - MYSQL_USER=streama
+    - MYSQL_PASSWORD=streama
+    - MYSQL_RANDOM_ROOT_PASSWORD=yes
+
+streama:
+  build: .
+  links:
+    - db:db
+  ports:
+    - 8080:8080
diff --git a/grails-app/conf/DataSource.groovy b/grails-app/conf/DataSource.groovy
@@ -75,7 +75,7 @@ environments {
 
             //DEV
             String host = System.getenv('MYSQL_HOST')
-            if(!host) host = "mysql"
+            if(!host) host = "db"
             String port = System.getenv('MYSQL_PORT')
             if(!port) port = "3306"
             String db = System.getenv('MYSQL_DB')