aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-09-02 15:35:59 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-09-02 15:35:59 +0200
commite66b1c2c54f51c4267f2f73753e7f915033eac6d (patch)
tree932c89a08d6059bd0f8dd2640bd931fd1cd1474b
parentd40c41004d0f234140f5ec9fc029f4ef6ce3f60c (diff)
downloadinfrastructure-e66b1c2c54f51c4267f2f73753e7f915033eac6d.tar.gz
infrastructure-e66b1c2c54f51c4267f2f73753e7f915033eac6d.zip
Upgrade Plume
-rw-r--r--app/docker-compose.yml11
-rw-r--r--app/plume/build/plume/Dockerfile2
-rw-r--r--app/plume/config/app.env2
-rw-r--r--app/plume/deploy/plume.hcl4
4 files changed, 7 insertions, 12 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 4e75196..90f6a58 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -1,13 +1,6 @@
version: '3.4'
services:
- mariadb:
- build:
- context: ./seafile/build/mariadb
- args:
- VERSION: 4 # fake for now
- image: superboum/amd64_mariadb:v4
-
# Instant Messaging
riot:
build:
@@ -81,8 +74,8 @@ services:
build:
context: ./plume/build/plume
args:
- VERSION: 5424f9110f8749eb7d9f01b44ac8074fc13e0e68
- image: superboum/plume:v3
+ VERSION: 8c372aa6fcd05083601903d83b0fcb4915585a95
+ image: superboum/plume:v4
postfix:
build:
diff --git a/app/plume/build/plume/Dockerfile b/app/plume/build/plume/Dockerfile
index 4e1401d..0afe17d 100644
--- a/app/plume/build/plume/Dockerfile
+++ b/app/plume/build/plume/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.47.0-slim-buster as builder
+FROM rust:1.54.0-slim-bullseye as builder
RUN apt-get update && \
apt-get install -y \
diff --git a/app/plume/config/app.env b/app/plume/config/app.env
index 1c234e7..3dbf609 100644
--- a/app/plume/config/app.env
+++ b/app/plume/config/app.env
@@ -28,3 +28,5 @@ LDAP_USER_NAME_ATTR=cn
LDAP_USER_MAIL_ATTR=mail
LDAP_TLS=false
+RUST_BACKTRACE=1
+RUST_LOG=info
diff --git a/app/plume/deploy/plume.hcl b/app/plume/deploy/plume.hcl
index 9709c3b..b1d5b9c 100644
--- a/app/plume/deploy/plume.hcl
+++ b/app/plume/deploy/plume.hcl
@@ -17,7 +17,7 @@ job "plume" {
task "plume" {
driver = "docker"
config {
- image = "superboum/plume:v3"
+ image = "superboum/plume:v4"
network_mode = "host"
ports = [ "web_port" ]
#command = "cat"
@@ -35,7 +35,7 @@ job "plume" {
}
resources {
- memory = 100
+ memory = 300
cpu = 100
}