From 2e34599b0b214738fd73201dcd2b3ddfc893dfc1 Mon Sep 17 00:00:00 2001
From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com>
Date: Sun, 22 Oct 2023 02:33:23 +0200
Subject: [PATCH] Add docker-compose configuration with pg database

---
 .gitignore           |  1 +
 README.md            | 22 ++++++++++++++++++----
 docker-compose-pg.sh | 11 +++++++++++
 docker-compose.yaml  | 42 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100755 docker-compose-pg.sh
 create mode 100644 docker-compose.yaml

diff --git a/.gitignore b/.gitignore
index e01e8f136..22180b445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ ciso_assistant/build.json
 *.sqlite3
 db/django_secret_key
 db/attachments/
+db/data/
diff --git a/README.md b/README.md
index 96d496be9..23f44ca5e 100644
--- a/README.md
+++ b/README.md
@@ -102,12 +102,12 @@ python manage.py collectstatic
 python manage.py createsuperuser
 ```
 
-5. Run CISO
+5. Run CISO Assistant
 
 ```sh
 python manage.py runserver
 ```
-You can then reach CISO using your web brower at [http://127.0.0.1:8000/](http://127.0.0.1:8000/)
+You can then reach CISO Assistant using your web brower at [http://127.0.0.1:8000/](http://127.0.0.1:8000/)
 
 #### Using Docker
 
@@ -127,7 +127,7 @@ docker run --rm -it --env CREATE_SUPERUSER=true -p 8000:8000 -v ./db:/code/db  c
 
 When asked for, enter your email and password for your superuser.
 
-You can then reach CISO using your web brower at [http://127.0.0.1:8000/](http://127.0.0.1:8000/)
+You can then reach CISO Assistant using your web brower at [http://127.0.0.1:8000/](http://127.0.0.1:8000/)
 
 For the following executions, simply run:
 
@@ -137,7 +137,21 @@ docker run --rm -p 8000:8000 -v ./db:/code/db  ciso-assistant:$(<ciso_assistant/
 
 ⚠️ *WARNING*: If you're using WSL you'll need to activate *Systemd*. Check out this [topic](https://stackoverflow.com/questions/65400999/enable-systemd-in-wsl-2) to do it.
 
-### How to set up CISO for development? ✍️
+
+#### Using docker-compose with a Postgres database
+
+Simply launch:
+```sh
+./docker-compose-pg.sh
+```
+
+When asked for, enter your email and password for your superuser.
+
+You can then reach CISO Assistant using your web brower at [http://127.0.0.1:8000/](http://127.0.0.1:8000/)
+
+For following executions, use "docker-compose up" directly.
+
+### How to set up CISO Assistant for development? ✍️
 
 1. Clone the repository.
 
diff --git a/docker-compose-pg.sh b/docker-compose-pg.sh
new file mode 100755
index 000000000..5f4f02dcc
--- /dev/null
+++ b/docker-compose-pg.sh
@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+if [ -d db/data ] ; then
+    echo "the database seems already created"
+    echo "you should launch docker-compose up -d"
+else
+    POSTGRES_PASSWORD=`uuidgen` docker-compose up -d
+    echo "initialize your superuser account..."
+    docker-compose exec ciso-assistant python manage.py createsuperuser
+    echo "for successive runs you can now use docker compose up"
+fi
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 000000000..a133a8d6b
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,42 @@
+version: "3.5"
+services:
+    ciso-assistant:
+      build: .
+      image: ciso-assistant:0.9.1 
+      container_name: "ciso-assistant"
+      ports:
+        - "8000:8000"
+      depends_on:
+        postgres:
+          condition: service_healthy
+      environment:
+        DJANGO_DEBUG: "True"
+        CISO_URL: http://127.0.0.1:8000
+        POSTGRES_NAME: postgres
+        POSTGRES_USER: postgres
+        POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+#        CISO_SUPERUSER_EMAIL: ciso@assistant.local
+        EMAIL_HOST: your.mail.server
+        EMAIL_PORT: 1025
+        EMAIL_HOST_USER: ''
+        EMAIL_HOST_PASSWORD: ''
+        EMAIL_USE_TLS: "False"
+        EMAIL_USE_SSL: "False"
+        DEFAULT_FROM_EMAIL: ciso@assistant.local
+        DB_HOST: ciso-postgres
+      volumes:
+        - ./db:/code/db
+
+    postgres:
+      image: postgres
+      container_name: "ciso-postgres"
+      restart: always
+      environment:
+        POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+      volumes:
+        - ./db/data:/var/lib/postgresql/data
+      healthcheck:
+        test: ["CMD-SHELL", "pg_isready -U postgres"]
+        interval: 5s
+        timeout: 5s
+        retries: 5