From 44981257fa909eeb35ed19267b96562e0de48c10 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 2 Oct 2019 10:51:21 +0200
Subject: [PATCH] prepare new release

---
 .gitignore                          |  1 +
 CHANGELOG.md                        | 11 ++++++++---
 Dockerfile.linux.amd64              |  5 ++---
 README.md                           |  9 ++++++---
 docker-compose.yml                  |  2 ++
 overlay/usr/local/bin/entrypoint.sh |  4 ++--
 6 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..65e3ba2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+test/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72acd59..04052a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
-* BUGFIX
-  * fix port in healthcheck script
-  * small vhost adjustments
+* BREAKING
+  * change docker tags from `1.2.1103` to `1.2.11-3`
+
+* ENHANCEMENT
+  * move out supercronic to base image
+  * add mising volume definition in dockerfile
+  * change default healthcheck timeout to 5s
+  * cleanup
diff --git a/Dockerfile.linux.amd64 b/Dockerfile.linux.amd64
index b93cce3..9d44937 100644
--- a/Dockerfile.linux.amd64
+++ b/Dockerfile.linux.amd64
@@ -19,8 +19,6 @@ RUN apk --update add --virtual .build-deps tar curl && \
     mkdir -p /var/www/app && \
     curl -SsL ${KANBOARD_TARBALL} | tar xz -C /var/www/app/ --strip-components=1 && \
     curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
-    curl -SsL -o /usr/local/bin/supercronic https://github.com/aptible/supercronic/releases/download/v0.1.9/supercronic-linux-amd64 && \
-    chmod 755 /usr/local/bin/supercronic && \
     apk del .build-deps && \
     rm -rf /var/cache/apk/* && \
     rm -rf /tmp/* && \
@@ -37,6 +35,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
 ADD overlay/ /
 
 VOLUME /var/www/app/plugins
+VOLUME /var/www/app/data
 
 EXPOSE 8080
 
@@ -45,6 +44,6 @@ USER nginx
 STOPSIGNAL SIGTERM
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD /usr/local/bin/healthcheck.sh
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD /usr/local/bin/healthcheck.sh
 WORKDIR /var/www/app
 CMD []
diff --git a/README.md b/README.md
index 0487792..b70c117 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Here are some example snippets to help you get started creating a container. Thi
 ```Shell
 docker create \
   --name=kanboard \
-  -p 80:80 \
+  -p 80:8080 \
   xoxys/kanboard
 ```
 
@@ -32,12 +32,15 @@ version: '2.1'
 
 services:
   kanboard:
-    image: kanboard/kanboard:latest
+    container_name: kanboard
+    image: xoxys/kanboard:latest
     ports:
-      - "80:80"
+      - "80:8080"
     volumes:
       - kanboard_data:/var/www/app/data
       - kanboard_plugins:/var/www/app/plugins
+    environment:
+      KANBOARD_PLUGIN_INSTALLER: "true"
 
 volumes:
   kanboard_data:
diff --git a/docker-compose.yml b/docker-compose.yml
index c6a5250..65b8a04 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
+---
 version: '2.1'
 
 services:
   kanboard:
+    container_name: kanboard
     image: xoxys/kanboard:latest
     ports:
       - "80:8080"
diff --git a/overlay/usr/local/bin/entrypoint.sh b/overlay/usr/local/bin/entrypoint.sh
index 4156433..f580091 100755
--- a/overlay/usr/local/bin/entrypoint.sh
+++ b/overlay/usr/local/bin/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-/usr/local/bin/gomplate -V -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl 1>/dev/null
-/usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl 1>/dev/null
+/usr/local/bin/gomplate -V -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl
+/usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
 
 exec supercronic -split-logs /etc/crontabs/nginx 1>/dev/null &
 exec php-fpm7 -F &