From fab7fbed1e22edc05abdfdeeb305e41e80ef876f Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Fri, 30 Jul 2021 00:57:54 -0400
Subject: [PATCH] Fix wallabag to actually work

---
 docker/wallabag/Dockerfile          | 5 ++++-
 docker/wallabag/files/entrypoint.sh | 3 +++
 nomad/wallabag.nomad                | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 docker/wallabag/files/entrypoint.sh

diff --git a/docker/wallabag/Dockerfile b/docker/wallabag/Dockerfile
index ff749ac..80666d5 100644
--- a/docker/wallabag/Dockerfile
+++ b/docker/wallabag/Dockerfile
@@ -1,10 +1,13 @@
-FROM wallabag/wallabag:latest
+FROM wallabag/wallabag:2.4.2
 
 # add ca-certificates package
 RUN apk add --no-cache ca-certificates
 
 # Copy masked.name root cert
 COPY files/MaskedName_Root_CA.crt /usr/local/share/ca-certificates/MaskedName_Root_CA.crt
+COPY files/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 # update ca certs
 RUN update-ca-certificates 2>/dev/null
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/docker/wallabag/files/entrypoint.sh b/docker/wallabag/files/entrypoint.sh
new file mode 100755
index 0000000..ed017fa
--- /dev/null
+++ b/docker/wallabag/files/entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+/entrypoint.sh migrate
+/entrypoint.sh wallabag
diff --git a/nomad/wallabag.nomad b/nomad/wallabag.nomad
index bf3e7ef..e846b04 100644
--- a/nomad/wallabag.nomad
+++ b/nomad/wallabag.nomad
@@ -66,6 +66,7 @@ job "wallabag" {
           SYMFONY__ENV__DATABASE_USER     = wallabag
           SYMFONY__ENV__DATABASE_PASSWORD = "{{ with secret "kv/data/wallabag" }}{{ .Data.data.db_pw }}{{ end }}"
           SYMFONY__ENV__DOMAIN_NAME       = "https://wallabag.minhas.io"
+          POPULATE_DATABASE               = False
         EOH
         destination = "secrets/wallabag.env"
         env         = true