Merge pull request #40 from GroupHQ/GROUP-105-Migrate-to-AWS-ECS

GROUP-105 Moved certificate to resources, added Spring SSL bundle
GroupHQ · Jun 25, 2024 · e1218a4 · e1218a4
2 parents f516641 + 3cdb0f3
commit e1218a4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/commit-stage.yml b/.github/workflows/commit-stage.yml
@@ -95,8 +95,6 @@ jobs:
           chmod +x gradlew
           ./gradlew bootBuildImage \
           --imageName ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
-      - name: Add Amazon RDS Root Certificate (us-east-1)
-        run: docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }} .
       - name: OCI image vulnerability scanning
         uses: anchore/scan-action@v3
         id: scan

diff --git a/Dockerfile b/Dockerfile
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
@@ -2,14 +2,28 @@ server:
   error:
     include-stacktrace: never
 spring:
+  ssl:
+    bundle:
+      pem:
+        client:
+          truststore:
+            certificate: "classpath:aws/postgres/root.crt"
   r2dbc:
     url: r2dbc:postgresql://${POSTGRES_HOST:grouphq-postgres}/grouphq_groups
     properties:
       sslMode: VERIFY_FULL
+      sslRootCert: "classpath:aws/postgres/root.crt"
   flyway:
-    url: jdbc:postgresql://${POSTGRES_HOST:grouphq-postgres}/grouphq_groups?ssl=true&sslMode=verify-full
+    url: jdbc:postgresql://${POSTGRES_HOST:grouphq-postgres}/grouphq_groups
+    jdbc-properties:
+      ssl: true
+      sslMode: verify_full
+      sslRootCert: "classpath:aws/postgres/root.crt"
   rabbitmq:
     host: ${RABBITMQ_HOST:grouphq-rabbitmq}
+    port: 5671
+    ssl:
+      enabled: true
 openai:
   enabled: true
   api_key: ${OPEN_AI_API_KEY}