From 961453812ca9c887e014cae96943113fdc9879e0 Mon Sep 17 00:00:00 2001 From: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com> Date: Sun, 28 Jan 2024 07:23:14 +0100 Subject: [PATCH] fix: Fix gpg and less (#1321) * fix: Add gpg and less Add gpg so backup "bench --site yoursite.com backup --with-files --compress" does not fail if encryption is enabled Add "less": fixes #1301 * fix: Add gpg and less Add gpg so backup "bench --site yoursite.com backup --with-files --compress" does not fail if encryption is enabled Add "less": fixes frappe#1301 * fix: Update documentation update documentation to resemble current status * fix: trailing whitespace --------- Co-authored-by: Revant Nandgaonkar --- docs/single-server-example.md | 4 +++- images/custom/Containerfile | 2 ++ images/production/Containerfile | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/single-server-example.md b/docs/single-server-example.md index 419d876601..35cf54d73e 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -82,6 +82,8 @@ EMAIL=admin@example.com HASHED_PASSWORD=$apr1$K.4gp7RT$tj9R2jHh0D4Gb5o5fIAzm/ ``` +If Container does not deploy put the HASHED_PASSWORD in ''. + Deploy the traefik container with letsencrypt SSL ```shell @@ -91,7 +93,7 @@ docker compose --project-name traefik \ -f overrides/compose.traefik-ssl.yaml up -d ``` -This will make the traefik dashboard available on `traefik.example.com` and all certificates will reside in `/data/traefik/certificates` on host filesystem. +This will make the traefik dashboard available on `traefik.example.com` and all certificates will reside in the Docker volume `cert-data`. For LAN setup deploy the traefik container without overriding `overrides/compose.traefik-ssl.yaml`. diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 9aeecaa848..a7c0fd389c 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -26,8 +26,10 @@ RUN useradd -ms /bin/bash frappe \ libpangocairo-1.0-0 \ # For backups restic \ + gpg \ # MariaDB mariadb-client \ + less \ # Postgres libpq-dev \ postgresql-client \ diff --git a/images/production/Containerfile b/images/production/Containerfile index ac5d77afe4..65e412f8eb 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -23,8 +23,10 @@ RUN useradd -ms /bin/bash frappe \ libpangocairo-1.0-0 \ # For backups restic \ + gpg \ # MariaDB mariadb-client \ + less \ # Postgres libpq-dev \ postgresql-client \