Fix wallabag to actually work

This commit is contained in:
Amarpreet Minhas 2021-07-30 00:57:54 -04:00
parent fa356847d3
commit fab7fbed1e
3 changed files with 8 additions and 1 deletions

View file

@ -1,10 +1,13 @@
FROM wallabag/wallabag:latest FROM wallabag/wallabag:2.4.2
# add ca-certificates package # add ca-certificates package
RUN apk add --no-cache ca-certificates RUN apk add --no-cache ca-certificates
# Copy masked.name root cert # Copy masked.name root cert
COPY files/MaskedName_Root_CA.crt /usr/local/share/ca-certificates/MaskedName_Root_CA.crt 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 # update ca certs
RUN update-ca-certificates 2>/dev/null RUN update-ca-certificates 2>/dev/null
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

View file

@ -0,0 +1,3 @@
#!/bin/bash
/entrypoint.sh migrate
/entrypoint.sh wallabag

View file

@ -66,6 +66,7 @@ job "wallabag" {
SYMFONY__ENV__DATABASE_USER = wallabag SYMFONY__ENV__DATABASE_USER = wallabag
SYMFONY__ENV__DATABASE_PASSWORD = "{{ with secret "kv/data/wallabag" }}{{ .Data.data.db_pw }}{{ end }}" SYMFONY__ENV__DATABASE_PASSWORD = "{{ with secret "kv/data/wallabag" }}{{ .Data.data.db_pw }}{{ end }}"
SYMFONY__ENV__DOMAIN_NAME = "https://wallabag.minhas.io" SYMFONY__ENV__DOMAIN_NAME = "https://wallabag.minhas.io"
POPULATE_DATABASE = False
EOH EOH
destination = "secrets/wallabag.env" destination = "secrets/wallabag.env"
env = true env = true