added db info for heroku container

ichbinorange · Feb 9, 2021 · dbd313f · dbd313f
1 parent b8723e6
commit dbd313f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,6 @@ VOLUME /tmp
 ARG JAR_FILE=build/libs/\*.jar
 COPY ${JAR_FILE} app.jar
 
-ENTRYPOINT ["java", "-Dspring.security.oauth2.client.registration.google.client-id='${GOOGLE_OAUTH_CLIENT_ID}'", "-Dspring.security.oauth2.client.registration.google.client-secret='${GOOGLE_OAUTH_CLIENT_SECRET}'","-jar","/app.jar"]
+ENTRYPOINT ["java", "-Dspring.security.oauth2.client.registration.google.client-id='${GOOGLE_OAUTH_CLIENT_ID}'", "-Dspring.security.oauth2.client.registration.google.client-secret='${GOOGLE_OAUTH_CLIENT_SECRET}'","-Dspring.datasource.url=jdbc:postgresql://ec2-54-225-190-241.compute-1.amazonaws.com:5432/d5cfl02tlmjad?user=fydstdjbhenvak&password=f1f657929a4002d5a59e78043d9ca6e77c5f112a18047b0db6ffb92742c1a225","-Dserver.port=$PORT","-jar","/app.jar"]
 
-EXPOSE 3000
+EXPOSE $PORT
diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ test {
 }
 
 bootRun {
-//	systemProperty 'spring.datasource.username', findProperty('PSQL_USERNAME')
+//	systemProperty 'spring.datasource.url', findProperty('HEROKU_PSQLDB')
 	systemProperty 'spring.security.oauth2.client.registration.google.client-id', findProperty('GOOGLE_CLIENT_ID')
 	systemProperty 'spring.security.oauth2.client.registration.google.client-secret', findProperty('GOOGLE_CLIENT_SECRET')
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,16 +9,25 @@ services:
     depends_on:
       - postgresql
     environment: # Pass environment variables to the service
-      SPRING_DATASOURCE_URL: jdbc:postgresql://habit_builder_postgres:5432/habitbuilder
-      SPRING_DATASOURCE_USERNAME: habitbuilderdocker
-      SPRING_DATASOURCE_PASSWORD: habitbuilderdocker
+      # revised DATABASE_URL to JDBC_URL: https://devcenter.heroku.com/articles/connecting-to-relational-databases-on-heroku-with-java
+      SPRING_DATASOURCE_URL: ${HEROKU_PSQLDB}
+      SPRING_DATASOURCE_USERNAME: fydstdjbhenvak
+      SPRING_DATASOURCE_PASSWORD: f1f657929a4002d5a59e78043d9ca6e77c5f112a18047b0db6ffb92742c1a225
+
+#      SPRING_DATASOURCE_URL: jdbc:postgresql://habit_builder_postgres:5432/habitbuilder
+#      SPRING_DATASOURCE_USERNAME: habitbuilderdocker
+#      SPRING_DATASOURCE_PASSWORD: habitbuilderdocker
   postgresql:
-    container_name: habit_builder_postgres
+    container_name: ec2-54-225-190-241.compute-1.amazonaws.com
+#    container_name: habit_builder_postgres
     image: postgres
     ports:
       - 5432:5432
     environment:
-      - POSTGRES_DB=habitbuilder
-      - POSTGRES_USER=habitbuilderdocker
-      - POSTGRES_PASSWORD=habitbuilderdocker
+      - POSTGRES_DB=d5cfl02tlmjad
+      - POSTGRES_USER=fydstdjbhenvak
+      - POSTGRES_PASSWORD=f1f657929a4002d5a59e78043d9ca6e77c5f112a18047b0db6ffb92742c1a225
+#      - POSTGRES_DB=habitbuilder
+#      - POSTGRES_USER=habitbuilderdocker
+#      - POSTGRES_PASSWORD=habitbuilderdocker
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,10 +1,15 @@
-server.port = 3000
-
+# For local use
+server.port=3000
 spring.datasource.url=jdbc:postgresql://localhost:5432/habitbuilder
+
+# For heroku deployment use
+#spring.datasource.driverClassName=org.postgresql.Driver
+#server.port=${PORT}
+
 spring.datasource.username=
 spring.datasource.password=
 
-# create-drop
+# create-drop --> for heroku deploy
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect