plain postgres

golang-cz · Dec 20, 2023 · c64c3a1 · c64c3a1
1 parent 97008e5
commit c64c3a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -11,7 +11,7 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     services:
-      skeleton-postgres:
+      postgres:
         image: postgres:15.3
         env:
           POSTGRES_USER: devbox
@@ -24,10 +24,9 @@ jobs:
           # - ${{ github.workspace }}/temp/db.sh:/home/db.sh
           # - ${{ github.workspace }}/temp/schema.sql:/home/schema.sql
           - ${{ github.workspace }}/temp:/home
-        options: --name skeleton-postgres
+        options: --name postgres
 
     steps:
-
       - name: Git clone
         run: |
           sudo chown -R $USER:$USER /home/runner/work/skeleton
@@ -48,7 +47,7 @@ jobs:
       - name: Restart postgres
         uses: docker://docker
         with:
-          args: docker restart skeleton-postgres
+          args: docker restart postgres
 
       - name: Git safe.directory
         # Fixes following git error:

diff --git a/etc/ci.toml b/etc/ci.toml
@@ -6,7 +6,7 @@ environment = "test"
     conn_max_lifetime = "1800s"
     connect_timeout = 5
     database = "skeleton_e2e"
-    host = "skeleton-postgres:5432" 
+    host = "postgres:5432" 
     max_idle_conns = 10
     max_open_conns = 100
     read_only = false

diff --git a/tests/e2e/api/main_test.go b/tests/e2e/api/main_test.go
@@ -122,7 +122,7 @@ func initDB(database string) error {
 	slog.Debug("Initializing DB", "database", database)
 
 	// Execute the command to create the new schema
-	createCmd := exec.Command("bash", "-c", fmt.Sprintf(`docker exec skeleton-postgres /bin/sh -c '/home/db.sh create %s'`, database))
+	createCmd := exec.Command("bash", "-c", fmt.Sprintf(`docker exec postgres /bin/sh -c '/home/db.sh create %s'`, database))
 	_, err := createCmd.Output()
 	if err != nil {
 		if e, ok := err.(*exec.ExitError); ok {
@@ -134,7 +134,7 @@ func initDB(database string) error {
 	}
 
 	// Import the schema.sql script into the new schema
-	importCmd := exec.Command("bash", "-c", fmt.Sprintf(`docker exec skeleton-postgres /bin/sh -c '/home/db.sh import %s %s'`, database, "/home/schema.sql"))
+	importCmd := exec.Command("bash", "-c", fmt.Sprintf(`docker exec postgres /bin/sh -c '/home/db.sh import %s %s'`, database, "/home/schema.sql"))
 	_, err = importCmd.Output()
 	if err != nil {
 		if e, ok := err.(*exec.ExitError); ok {