From ba3d84a1de4d392a22b66d90de21876720391728 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Thu, 7 Jan 2021 11:09:29 +0100
Subject: Upgrade plume

---
 app/build/docker-compose.yml | 4 ++--
 app/build/plume/Dockerfile   | 4 +---
 app/deployment/plume.hcl     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
index de2c229..ea5deac 100644
--- a/app/build/docker-compose.yml
+++ b/app/build/docker-compose.yml
@@ -80,8 +80,8 @@ services:
     build:
       context: ./plume
       args:
-        VERSION: 0cd26dfbf4ab7be467325ed77230cf371147a98e
-    image: superboum/plume:v1
+        VERSION: 0.6.0
+    image: superboum/plume:v2
 
   postfix:
     build:
diff --git a/app/build/plume/Dockerfile b/app/build/plume/Dockerfile
index 9199e1e..4e05424 100644
--- a/app/build/plume/Dockerfile
+++ b/app/build/plume/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && \
 
 ARG VERSION
 WORKDIR /opt
-RUN git clone -n https://git.deuxfleurs.fr/Deuxfleurs/plume.git
+RUN git clone -n https://git.joinplu.me/Plume/Plume.git plume
 
 WORKDIR /opt/plume
 RUN git checkout ${VERSION}
@@ -52,5 +52,3 @@ COPY --from=builder /usr/local/cargo/bin/plume /usr/local/bin/
 COPY plm-start /usr/local/bin/
 
 CMD ["plm-start"]
-
-EXPOSE 7878
diff --git a/app/deployment/plume.hcl b/app/deployment/plume.hcl
index 59ec28a..1bdc332 100644
--- a/app/deployment/plume.hcl
+++ b/app/deployment/plume.hcl
@@ -17,7 +17,7 @@ job "plume" {
     task "plume" {
       driver = "docker"
       config {
-        image = "superboum/plume:v1"
+        image = "superboum/plume:v2"
         network_mode = "host"
         ports = [ "web_port" ]
         #command = "cat"
-- 
cgit v1.2.3