aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-10-15 21:20:11 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-10-15 21:20:11 +0200
commit4af75bd8b829178d35812dcdcde0b316c67d7697 (patch)
tree8208e2dfe181029eea79a155fb7fe1fdd6caa89e
parent25ec221248904c14bf1e7283620121c52c244437 (diff)
downloadinfrastructure-4af75bd8b829178d35812dcdcde0b316c67d7697.tar.gz
infrastructure-4af75bd8b829178d35812dcdcde0b316c67d7697.zip
WIP plume
-rw-r--r--app/build/docker-compose.yml7
-rwxr-xr-xapp/build/plume/plm-start6
-rw-r--r--app/integration/plume/docker-compose.yml15
-rw-r--r--app/integration/plume/plume.env25
4 files changed, 52 insertions, 1 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
index 109a26a..1ca740a 100644
--- a/app/build/docker-compose.yml
+++ b/app/build/docker-compose.yml
@@ -61,3 +61,10 @@ services:
args:
VERSION: fake-1
image: superboum/amd64_jitsi_xmpp:v4
+
+ plume:
+ build:
+ context: ./plume
+ args:
+ VERSION: 003dcf861a9f55720b03d52f2f95f5f59e338809
+ image: superboum/plume:v1
diff --git a/app/build/plume/plm-start b/app/build/plume/plm-start
index 694b8c8..da9d288 100755
--- a/app/build/plume/plm-start
+++ b/app/build/plume/plm-start
@@ -1,5 +1,9 @@
#!/bin/bash
-diesel migration run
+until plm migration run;
+ do sleep 2;
+done
plm search init
+plm instance new --domain "$DOMAIN_NAME" --name "$INSTANCE_NAME" --private
+
plume
diff --git a/app/integration/plume/docker-compose.yml b/app/integration/plume/docker-compose.yml
new file mode 100644
index 0000000..2ec8371
--- /dev/null
+++ b/app/integration/plume/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.4'
+services:
+ plume:
+ image: superboum/plume:v1
+ env_file:
+ - plume.env
+ ports:
+ - "7878:7878"
+
+ postgres:
+ image: postgres:9.6.19
+ environment:
+ - POSTGRES_DB=plume
+ - POSTGRES_USER=plume
+ - POSTGRES_PASSWORD=plume
diff --git a/app/integration/plume/plume.env b/app/integration/plume/plume.env
new file mode 100644
index 0000000..0db538f
--- /dev/null
+++ b/app/integration/plume/plume.env
@@ -0,0 +1,25 @@
+BASE_URL=integration.env
+# generate one with openssl rand -base64 32
+ROCKET_SECRET_KEY=cXZbKoxWIBo0wdaD8tbA1B3BlH2LBSUmgzdyZZr8QxI=
+
+# Mail settings
+#MAIL_SERVER=smtp.example.org
+#MAIL_USER=example
+#MAIL_PASSWORD=123456
+#MAIL_HELO_NAME=example.org
+
+# DATABASE SETUP
+POSTGRES_PASSWORD=plume
+POSTGRES_USER=plume
+POSTGRES_DB=plume
+DATABASE_URL=postgres://plume:plume@postgres:5432/plume
+MIGRATION_DIRECTORY=migrations/postgres
+
+USE_HTTPS=0
+ROCKET_ADDRESS=0.0.0.0
+ROCKET_PORT=7878
+
+MEDIA_UPLOAD_DIRECTORY=/app/static/media
+SEARCH_INDEX=/app/search_index
+DOMAIN_NAME="integration.env"
+INSTANCE_NAME="Integration Instance"