Merge pull request #159 from i-on-project/bug/gh-158-psql-remotely

Bug/gh 158 psql remotely
i-on-project · Jun 15, 2020 · 5d5e0a7 · 5d5e0a7
2 parents ff6d16d + 2727ef3
commit 5d5e0a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/gcp_release_deploy.yaml b/.github/workflows/gcp_release_deploy.yaml
@@ -81,11 +81,13 @@ jobs:
               -v "$(pwd)/../docker:/mnt" \
               $SCHEMA_DIFF_IMG apply
 
+      - name: Guarantee connection string refresh, in case this job is executed by a previous runner
+        working-directory: project
+        run: ./gradlew clean -p buildSrc
+
       - name: Insert Issue Token
-        env:
-          JDBC_DATABASE_URL: "jdbc:postgresql://localhost:${DB_PROXY_PORT}/${DB_NAME}?user=${DB_USER}&password=${DB_PASS}"
         working-directory: project
-        run: ./gradlew pgInsertIssueToken
+        run: JDBC_DATABASE_URL="jdbc:postgresql://localhost:$DB_PROXY_PORT/$DB_NAME?user=$DB_USER&password=$DB_PASS" ./gradlew pgInsertIssueToken
 
       - name: Kill proxy
         run: pkill cloud_sql_proxy

diff --git a/project/buildSrc/src/main/kotlin/db.kt b/project/buildSrc/src/main/kotlin/db.kt
@@ -288,14 +288,17 @@ class Token {
 
         val pgParams = Postgres.pgParams
         val result = project.exec {
-            commandLine("docker", "exec", Docker.CONTAINER_NAME,
-                    "psql",
-                    "-h", pgParams.host,
-                    "-U", pgParams.user,
-                    "-d", pgParams.db,
-                    "-w",
-                    "-1",
-                    "-c $insertQuery")
+            commandLine("docker", "run",
+                "-e", "PGPASSWORD=${pgParams.password}",
+                "--rm", "--network=host", Docker.IMAGE_NAME,
+                "psql",
+                "-h", pgParams.host,
+                "-U", pgParams.user,
+                "-d", pgParams.db,
+                "-p", pgParams.port,
+                "-w",
+                "-1",
+                "-c $insertQuery")
 
             environment(Postgres.ENV_PASSWORD, pgParams.password)
         }