From 40a46cd6758d8517df85b01da5cecfefaeccd303 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 22 Oct 2020 21:03:16 +0200
Subject: [PATCH] Bump GNU Health to version 3.6.5 on Alpine 3.12

---
 lxc-apps/gnuhealth/app   |  6 +++---
 lxc-apps/gnuhealth/image | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lxc-apps/gnuhealth/app b/lxc-apps/gnuhealth/app
index 1eaa7c5..bad1162 100644
--- a/lxc-apps/gnuhealth/app
+++ b/lxc-apps/gnuhealth/app
@@ -1,5 +1,5 @@
 {
-    "version": "3.6.4-200621",
+    "version": "3.6.5-201021",
     "meta": {
         "title": "GNU Health",
         "desc-cs": "Lékařské záznamy pacientů",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "gnuhealth": {
-            "image": "gnuhealth_3.6.4-200621",
+            "image": "gnuhealth_3.6.5-201021",
             "depends": [
                 "gnuhealth-postgres"
             ],
@@ -17,7 +17,7 @@
             }
         },
         "gnuhealth-postgres": {
-            "image": "postgres_12.2.0-200621",
+            "image": "postgres_12.4.0-201021",
             "mounts": {
                 "gnuhealth/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/gnuhealth/image b/lxc-apps/gnuhealth/image
index 0d11c73..235b7d7 100644
--- a/lxc-apps/gnuhealth/image
+++ b/lxc-apps/gnuhealth/image
@@ -1,5 +1,5 @@
-IMAGE gnuhealth_3.6.4-200621
-FROM alpine3.11-python3.8_3.8.2-200621
+IMAGE gnuhealth_3.6.5-201021
+FROM alpine3.12-python3.8_3.8.5-201021
 
 RUN EOF
     # Install runtime dependencies
@@ -9,7 +9,7 @@ RUN EOF
     apk --no-cache add --virtual .deps build-base freetype-dev git libffi-dev libjpeg-turbo-dev libxml2-dev libxslt-dev ncurses npm patch postgresql-dev python3-dev sudo
 
     # Download GNU Health
-    wget http://ftp.gnu.org/gnu/health/gnuhealth-3.6.4.tar.gz -O - | tar xzf - -C /srv
+    wget http://ftp.gnu.org/gnu/health/gnuhealth-3.6.5.tar.gz -O - | tar xzf - -C /srv
     mv /srv/gnuhealth-* /srv/install
 
     # Create OS user
@@ -17,10 +17,6 @@ RUN EOF
     adduser -S -u 8080 -h /srv/gnuhealth -s /bin/bash -g gnuhealth -G gnuhealth gnuhealth
     chown -R gnuhealth:gnuhealth /srv/gnuhealth
 
-    # Hackfix to install specific version of python dependency which doesn't fail during setup
-    # https://github.com/sdispater/pendulum/issues/457
-    sed -i 's/pendulum/pendulum==2.0.3/' /srv/install/gnuhealth-setup
-
     # Install GNU Health
     cd /srv/install
     sudo -u gnuhealth ./gnuhealth-setup install