-- replicated code

Author: gast0xC

.github/workflows/bica-ci.yml

@@ -31,13 +31,13 @@ jobs:
           name: docker-image
           path: image.tar
 
-  backup-unencrypted:
-    name: Backup Unencrypted & Show pg_dump
+  setup-postgres:
+    name: Setup PostgreSQL with Sample Data
     runs-on: ubuntu-latest
     needs: build
+    outputs:
+      network: bica-net
     steps:
-      - uses: actions/checkout@v4
-
       - name: Download image artifact
         uses: actions/download-artifact@v4
         with:
@@ -58,12 +58,12 @@ jobs:
             -e POSTGRES_DB=mydatabase \
             postgres:15
 
-      - name: Wait for Postgres to be ready (container-based)
+      - name: Wait for Postgres to be ready
         run: |
           for i in {1..30}; do
             docker run --rm --network bica-net postgres:15 \
               bash -c "PGPASSWORD=mypass pg_isready -h postgres-db -p 5432 -U myuser" && echo "Postgres is ready" && exit 0
-            echo "Waiting for Postgres..."
+            echo "Waiting for Postgres... attempt $i"
             sleep 2
           done
           echo "Postgres did not become ready in time"
@@ -81,42 +81,53 @@ jobs:
                 email TEXT NOT NULL UNIQUE,
                 created_at TIMESTAMP DEFAULT NOW()
               );
-
               CREATE TABLE IF NOT EXISTS posts (
                 id SERIAL PRIMARY KEY,
                 user_id INTEGER NOT NULL REFERENCES users(id),
                 title TEXT NOT NULL,
                 content TEXT,
                 published_at TIMESTAMP
               );
-
               CREATE TABLE IF NOT EXISTS comments (
                 id SERIAL PRIMARY KEY,
                 post_id INTEGER NOT NULL REFERENCES posts(id),
                 author_name TEXT NOT NULL,
                 comment TEXT NOT NULL,
                 created_at TIMESTAMP DEFAULT NOW()
               );
-
               INSERT INTO users (username, email) VALUES
                 ('alice', 'alice@example.com'),
                 ('bob', 'bob@example.com'),
                 ('carol', 'carol@example.com')
               ON CONFLICT DO NOTHING;
-
               INSERT INTO posts (user_id, title, content, published_at) VALUES
                 (1, 'First post', 'This is the content of the first post.', NOW() - INTERVAL '5 days'),
                 (1, 'Second post', 'More content here.', NOW() - INTERVAL '2 days'),
                 (2, 'Bob''s post', 'Bob writes something interesting.', NOW() - INTERVAL '3 days')
               ON CONFLICT DO NOTHING;
-
               INSERT INTO comments (post_id, author_name, comment) VALUES
                 (1, 'Eve', 'Great post, thanks!'),
                 (1, 'Mallory', 'I disagree with your point.'),
                 (3, 'Trent', 'Nice one, Bob!')
               ON CONFLICT DO NOTHING;
             "
 
+  backup-unencrypted:
+    name: Backup Unencrypted & Show pg_dump
+    runs-on: ubuntu-latest
+    needs: [build, setup-postgres]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download image artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: docker-image
+          path: .
+
+      - name: Load docker image
+        run: docker load -i image.tar
+
       - name: Prepare backup folder
         run: mkdir -p ./backups
 
@@ -139,7 +150,7 @@ jobs:
         run: |
           ls -lh ./backups
           tar -xzf ./backups/*.tar.gz -C ./backups
-          cat ./backups/db_backup.sql
+          head -40 ./backups/db_backup.sql
 
       - name: Cleanup
         run: |
@@ -149,7 +160,7 @@ jobs:
   backup-encrypted:
     name: Backup Encrypted
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build, setup-postgres]
     steps:
       - uses: actions/checkout@v4
 
@@ -162,76 +173,6 @@ jobs:
       - name: Load docker image
         run: docker load -i image.tar
 
-      - name: Create Docker network
-        run: docker network create bica-net || true
-
-      - name: Start PostgreSQL container
-        run: |
-          docker run -d --name postgres-db --network bica-net \
-            -e POSTGRES_USER=myuser \
-            -e POSTGRES_PASSWORD=mypass \
-            -e POSTGRES_DB=mydatabase \
-            postgres:15
-
-      - name: Wait for Postgres to be ready (container-based)
-        run: |
-          for i in {1..30}; do
-            docker run --rm --network bica-net postgres:15 \
-              bash -c "PGPASSWORD=mypass pg_isready -h postgres-db -p 5432 -U myuser" && echo "Postgres is ready" && exit 0
-            echo "Waiting for Postgres..."
-            sleep 2
-          done
-          echo "Postgres did not become ready in time"
-          exit 1
-
-      - name: Populate database with sample data
-        run: |
-          docker run --rm --network bica-net \
-            -e PGPASSWORD=mypass \
-            postgres:15 \
-            psql -h postgres-db -U myuser -d mydatabase -c "
-              CREATE TABLE IF NOT EXISTS users (
-                id SERIAL PRIMARY KEY,
-                username TEXT NOT NULL UNIQUE,
-                email TEXT NOT NULL UNIQUE,
-                created_at TIMESTAMP DEFAULT NOW()
-              );
-
-              CREATE TABLE IF NOT EXISTS posts (
-                id SERIAL PRIMARY KEY,
-                user_id INTEGER NOT NULL REFERENCES users(id),
-                title TEXT NOT NULL,
-                content TEXT,
-                published_at TIMESTAMP
-              );
-
-              CREATE TABLE IF NOT EXISTS comments (
-                id SERIAL PRIMARY KEY,
-                post_id INTEGER NOT NULL REFERENCES posts(id),
-                author_name TEXT NOT NULL,
-                comment TEXT NOT NULL,
-                created_at TIMESTAMP DEFAULT NOW()
-              );
-
-              INSERT INTO users (username, email) VALUES
-                ('alice', 'alice@example.com'),
-                ('bob', 'bob@example.com'),
-                ('carol', 'carol@example.com')
-              ON CONFLICT DO NOTHING;
-
-              INSERT INTO posts (user_id, title, content, published_at) VALUES
-                (1, 'First post', 'This is the content of the first post.', NOW() - INTERVAL '5 days'),
-                (1, 'Second post', 'More content here.', NOW() - INTERVAL '2 days'),
-                (2, 'Bob''s post', 'Bob writes something interesting.', NOW() - INTERVAL '3 days')
-              ON CONFLICT DO NOTHING;
-
-              INSERT INTO comments (post_id, author_name, comment) VALUES
-                (1, 'Eve', 'Great post, thanks!'),
-                (1, 'Mallory', 'I disagree with your point.'),
-                (3, 'Trent', 'Nice one, Bob!')
-              ON CONFLICT DO NOTHING;
-            "
-
       - name: Prepare backup folder
         run: mkdir -p ./backups
 
@@ -286,11 +227,10 @@ jobs:
             openssl enc -aes-256-cbc -d -pbkdf2 -salt -in "$f" -out "${f%.enc}.tar.gz" -k "$ENCRYPT_PASS"
           done
 
-      - name: Extract decrypted tarball and show pg_dump 
+      - name: Extract decrypted tarball and show pg_dump
         run: |
           tar -xzf ./backups/*.tar.gz -C ./backups
-          cat ./backups/db_backup.sql
-
+          head -40 ./backups/db_backup.sql
 
   docker-publish:
     name: Push to Docker Hub