From 696bb24bf824ed4d12010f96012c6de3e6c5bf5a Mon Sep 17 00:00:00 2001
From: Damian Borowiecki <dborowiecki@soldevelo.com>
Date: Tue, 18 Jul 2023 11:03:00 +0200
Subject: [PATCH 1/4] CM-235: Fixed json_schema extension

---
 Dockerfile                                 | 2 +-
 database scripts/json_schema_extension.sql | 1 +
 install_postgres_json_schema_extension.sh  | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 database scripts/json_schema_extension.sql

diff --git a/Dockerfile b/Dockerfile
index 4a4feed..6e2eafe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM postgres:13-alpine
 
 # Script to detect whether the database has finished initializing
 COPY ["true_isready.sh", "/usr/local/bin/"]
-COPY ["database scripts/00_dump.sql", "database scripts/0[2345]_*.sql", "database scripts/demo_db.sql", "/docker-entrypoint-initdb.d/"]
+COPY ["database scripts/00_dump.sql", "database scripts/0[2345]_*.sql", "database scripts/demo_db.sql", "database scripts/json_schema_extension.sql", "/docker-entrypoint-initdb.d/"]
 
 # Install https://github.com/gavinwahl/postgres-json-schema/
 # extension that allows validation of jsonb fields against jsonschema 
diff --git a/database scripts/json_schema_extension.sql b/database scripts/json_schema_extension.sql
new file mode 100644
index 0000000..54335c5
--- /dev/null
+++ b/database scripts/json_schema_extension.sql	
@@ -0,0 +1 @@
+CREATE EXTENSION "postgres-json-schema";
\ No newline at end of file
diff --git a/install_postgres_json_schema_extension.sh b/install_postgres_json_schema_extension.sh
index e8d6220..38889d0 100644
--- a/install_postgres_json_schema_extension.sh
+++ b/install_postgres_json_schema_extension.sh
@@ -18,6 +18,3 @@ apk add postgresql-client
 /bin/mkdir -p '/usr/local/share/postgresql/extension'
 
 chmod 666 /usr/local/share/postgresql/extension/postgres-json-schema.control
-# Add extension to PostgreSQL
-# Assuming you're operating in the psql shell
-psql -U $POSTGRES_USER -d $POSTGRES_DB -c "CREATE EXTENSION \"postgres-json-schema\";"

From d404f15d0f5f5c0465b35631d7bc312424da7c25 Mon Sep 17 00:00:00 2001
From: Damian Borowiecki <dborowiecki@soldevelo.com>
Date: Tue, 18 Jul 2023 11:05:56 +0200
Subject: [PATCH 2/4] CM-235: Added CI check for docker image build

---
 .github/workflows/docker-build-check.yaml | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/docker-build-check.yaml

diff --git a/.github/workflows/docker-build-check.yaml b/.github/workflows/docker-build-check.yaml
new file mode 100644
index 0000000..f70793c
--- /dev/null
+++ b/.github/workflows/docker-build-check.yaml
@@ -0,0 +1,29 @@
+name: Docker Build Check
+
+on:
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Build Docker image
+        run: docker build -t <your_image_name>:<your_tag> .
+
+      - name: Check Docker image build status
+        run: |
+          exit_code=$?
+          if [ $exit_code -ne 0 ]; then
+            echo "Docker image build failed."
+            exit 1
+          else
+            echo "Docker image build successful."
+            exit 0
+          fi
\ No newline at end of file

From f32ccb5914ac564412a825c09378016211ef03d5 Mon Sep 17 00:00:00 2001
From: Damian Borowiecki <dborowiecki@soldevelo.com>
Date: Tue, 18 Jul 2023 11:25:59 +0200
Subject: [PATCH 3/4] CM-235: Fixed build config

---
 .github/workflows/docker-build-check.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-check.yaml b/.github/workflows/docker-build-check.yaml
index f70793c..3a6c296 100644
--- a/.github/workflows/docker-build-check.yaml
+++ b/.github/workflows/docker-build-check.yaml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build Docker image
-        run: docker build -t <your_image_name>:<your_tag> .
+        run: docker build -t .
 
       - name: Check Docker image build status
         run: |

From 8b7966bfe7678e456ba2446a6ae8bd722e5a71eb Mon Sep 17 00:00:00 2001
From: Damian Borowiecki <dborowiecki@soldevelo.com>
Date: Tue, 18 Jul 2023 11:26:49 +0200
Subject: [PATCH 4/4] CM-235: Fixed build config

---
 .github/workflows/docker-build-check.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-check.yaml b/.github/workflows/docker-build-check.yaml
index 3a6c296..8b05a27 100644
--- a/.github/workflows/docker-build-check.yaml
+++ b/.github/workflows/docker-build-check.yaml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build Docker image
-        run: docker build -t .
+        run: docker build .
 
       - name: Check Docker image build status
         run: |