Merge pull request #13 from Google-IO-Extended-Grand-Rapids/feature/r…

…emove_ip_address_for_postgres using a different docker base image for web container
Google-IO-Extended-Grand-Rapids · Feb 4, 2015 · a00b4d8 · a00b4d8
2 parents 16b0c56 + c15bf5d
commit a00b4d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.2-jdk-7-onbuild
+FROM maven:3.2-jdk-7
 MAINTAINER danmikita@gmail.com
 EXPOSE 8080
 COPY . /opt/conference_web

diff --git a/src/main/resources/liquibase/liquibase.properties b/src/main/resources/liquibase/liquibase.properties
@@ -1,4 +1,4 @@
 driver: org.postgresql.Driver
-url: jdbc:postgresql://172.17.0.2:5432/postgres
+url: jdbc:postgresql://postgres:5432/postgres
 username: postgres
 password: postgres