From 29d791afe1de29037118550db5c5b02ce8e8ebc7 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sat, 22 Feb 2020 15:33:23 +0100
Subject: [PATCH] Bump Kanboard to 1.2.13 on Alpine 3.11

---
 lxc-apps/kanboard/{lxcfile => image}               | 14 +++++++-------
 .../{lxc => image.d}/etc/crontabs/kanboard         |  0
 .../kanboard/{lxc => image.d}/etc/nginx/nginx.conf |  0
 .../{lxc => image.d}/etc/php7/php-fpm.conf         |  0
 .../etc/services.d/.s6-svscan/finish               |  0
 .../{lxc => image.d}/etc/services.d/cron/run       |  0
 .../{lxc => image.d}/etc/services.d/nginx/run      |  0
 .../{lxc => image.d}/etc/services.d/php-fpm/run    |  0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename lxc-apps/kanboard/{lxcfile => image} (86%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/crontabs/kanboard (100%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/nginx/nginx.conf (100%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/php7/php-fpm.conf (100%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/services.d/.s6-svscan/finish (100%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/services.d/cron/run (100%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/services.d/nginx/run (100%)
 rename lxc-apps/kanboard/{lxc => image.d}/etc/services.d/php-fpm/run (100%)

diff --git a/lxc-apps/kanboard/lxcfile b/lxc-apps/kanboard/image
similarity index 86%
rename from lxc-apps/kanboard/lxcfile
rename to lxc-apps/kanboard/image
index b7b7c9e..c5ab458 100644
--- a/lxc-apps/kanboard/lxcfile
+++ b/lxc-apps/kanboard/image
@@ -1,5 +1,5 @@
-IMAGE kanboard_1.2.9-190620
-FROM alpine3.9-php7.2_7.2.19-190620
+IMAGE kanboard_1.2.13-200207
+FROM alpine3.11-php7.3_7.3.14-200207
 
 RUN EOF
     # Install runtime dependencies
@@ -9,9 +9,9 @@ RUN EOF
     apk --no-cache add --virtual .deps git
 
     # Download KanBoard
-    wget https://github.com/kanboard/kanboard/archive/v1.2.9.zip -O /srv/kanboard.zip
+    wget https://github.com/kanboard/kanboard/archive/v1.2.13.zip -O /srv/kanboard.zip
     unzip /srv/kanboard.zip -d /srv
-    mv /srv/kanboard-1.2.9 /srv/kanboard
+    mv /srv/kanboard-1.2.13 /srv/kanboard
 
     # Install plugins
     git clone --depth=1 https://github.com/BlueTeck/kanboard_plugin_overwrite_translation /srv/kanboard/plugins/Overwrite_translation
@@ -30,8 +30,8 @@ RUN EOF
     git clone --depth=1 https://github.com/xavividal/kanboard-plugin-relationgraph /srv/kanboard/plugins/Relationgraph
 
     # Create OS user
-    addgroup -S -g 8080 kanboard
-    adduser -S -u 8080 -h /srv/kanboard -s /bin/false -g kanboard -G kanboard kanboard
+    addgroup -S kanboard
+    adduser -S -h /srv/kanboard -s /bin/false -g kanboard -G kanboard kanboard
 
     # Cleanup
     apk --no-cache del .deps
@@ -39,6 +39,6 @@ RUN EOF
     find /srv/kanboard -name '.git*' -exec rm -rf {} +
 EOF
 
-COPY lxc
+COPY image.d
 
 CMD /bin/s6-svscan /etc/services.d
diff --git a/lxc-apps/kanboard/lxc/etc/crontabs/kanboard b/lxc-apps/kanboard/image.d/etc/crontabs/kanboard
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/crontabs/kanboard
rename to lxc-apps/kanboard/image.d/etc/crontabs/kanboard
diff --git a/lxc-apps/kanboard/lxc/etc/nginx/nginx.conf b/lxc-apps/kanboard/image.d/etc/nginx/nginx.conf
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/nginx/nginx.conf
rename to lxc-apps/kanboard/image.d/etc/nginx/nginx.conf
diff --git a/lxc-apps/kanboard/lxc/etc/php7/php-fpm.conf b/lxc-apps/kanboard/image.d/etc/php7/php-fpm.conf
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/php7/php-fpm.conf
rename to lxc-apps/kanboard/image.d/etc/php7/php-fpm.conf
diff --git a/lxc-apps/kanboard/lxc/etc/services.d/.s6-svscan/finish b/lxc-apps/kanboard/image.d/etc/services.d/.s6-svscan/finish
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/services.d/.s6-svscan/finish
rename to lxc-apps/kanboard/image.d/etc/services.d/.s6-svscan/finish
diff --git a/lxc-apps/kanboard/lxc/etc/services.d/cron/run b/lxc-apps/kanboard/image.d/etc/services.d/cron/run
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/services.d/cron/run
rename to lxc-apps/kanboard/image.d/etc/services.d/cron/run
diff --git a/lxc-apps/kanboard/lxc/etc/services.d/nginx/run b/lxc-apps/kanboard/image.d/etc/services.d/nginx/run
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/services.d/nginx/run
rename to lxc-apps/kanboard/image.d/etc/services.d/nginx/run
diff --git a/lxc-apps/kanboard/lxc/etc/services.d/php-fpm/run b/lxc-apps/kanboard/image.d/etc/services.d/php-fpm/run
similarity index 100%
rename from lxc-apps/kanboard/lxc/etc/services.d/php-fpm/run
rename to lxc-apps/kanboard/image.d/etc/services.d/php-fpm/run