Add PSQL as docker compose service

Makefile

@@ -3,19 +3,15 @@ setup:
 	docker compose build
 	docker compose run inferno bundle exec rake db:migrate
 
+generate:
+	docker compose run inferno bundle exec rake au_core:generate
+
 run:
 	docker compose build
 	docker compose up
 
-run-production:
-	docker compose build
-	docker compose -f docker-compose.yml -f docker-compose.production.yml up
-
 stop:
 	docker compose stop
 
 down:
 	docker compose down
-
-generate:
-	bundle exec rake au_core:generate

README.md

@@ -1,30 +1,25 @@
-# AU Core Test Kit
+# AU FHIR Core Inferno 🔥
+This is an [Inferno](https://inferno-framework.github.io/inferno-core/) test kit for the [AU Core Implementation Guide](http://hl7.org.au/fhir/core/)
 
-## Dev version
-Please try dev version here http://au-inferno.beda.software/
+**Currently available versions:**
+1. [v0.3.0-ballot](http://hl7.org.au/fhir/core/0.3.0-ballot/)
 
-## Generate tests
+## Use inferno as a service
+You can test your FHIR server using this link https://inferno.hl7.org.au/
 
-1. Put your IG in the folder
-```bash
-/lib/au_core_test_kit/igs
-```
-2. Execute ruby script
-```bash
-make generate
-```
-
-## Run inferno
-1. Run setup script
+## Run inferno locally via Docker
+It is highly recommended that you use Docker to run these tests. This test kit requires at least 10 GB of memory are available to Docker.
+1. Clone this repo.
+2. Run the setup script to initialize the database
 ```bash
 make setup
 ```
-2. Run
+3. Run project
 ```bash
 make run
 ```
+4. Navigate to http://localhost. The AU Core test suite will be available.
 
-## Run production
-```bash
-make run-production
-```
+## Additional information
+1. [Pre-requisites](/docs/pre-requisites.md)
+2. [Validator instructions](/docs/validator_instructions.md)

docker-compose.yml

@@ -5,16 +5,33 @@ services:
       context: ./
     volumes:
       - ./data:/opt/inferno/data
+      - ./lib/au_core_test_kit:/opt/inferno/lib/au_core_test_kit
     depends_on:
-      - validator-service
+      validator-service:
+        condition: service_started
+      postgres:
+        condition: service_healthy
+    environment:
+      POSTGRES_HOST: postgres
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: inferno
+      POSTGRES_USER: postgres
   worker:
     build:
       context: ./
     volumes:
       - ./data:/opt/inferno/data
     command: bundle exec sidekiq -r ./worker.rb
     depends_on:
-      - redis
+      redis:
+        condition: service_started
+      postgres:
+        condition: service_healthy
+    environment:
+      POSTGRES_HOST: postgres
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: inferno
+      POSTGRES_USER: postgres
   validator-service:
     extends:
       file: docker-compose.background.yml
@@ -33,3 +50,14 @@ services:
     extends:
       file: docker-compose.background.yml
       service: redis
+  postgres:
+    image: postgres:16.2-alpine3.19
+    restart: always
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-U", "postgres" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    environment:
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: inferno