Upgrading to Version 3.17.7+190627

Fix sha256sum check

README.md

@@ -62,6 +62,20 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
 
 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
 
+# Running this image with docker-compose
+
+The easiest way to get a fully featured and functional setup is using a docker-compose file. Several examples are provided in the repository.
+
+```
+docker-compose up
+
+# Frontend
+http://localhost:8080/
+
+# Backend
+http://localhost:8080/index.php/admin
+```
+
 # References
 
 - https://www.limesurvey.org/

apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.15.9+190214'
-ARG sha256_checksum='cf3c49425119f627e92a69d43f9d869fdb1c56d6b152adb7853e6b138edd1eed'
+ARG version='3.17.7+190627'
+ARG sha256_checksum='fe76b1ed873d20f6fb113d12ef2557eda2ea7565388774506a29f31a9943cd3f'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -17,7 +17,7 @@ RUN set -ex; \
         libpq-dev \
         netcat \
         \
-        && apt-get autoclean; apt-get autoremove; \
+        && apt-get -y autoclean; apt-get -y autoremove; \
         rm -rf /var/lib/apt/lists/*
 
 # Link LDAP library for PHP ldap extension
@@ -57,7 +57,7 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
 
 RUN set -ex; \
-        echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/${version}.tar.gz" && \

fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.15.9+190214'
-ARG sha256_checksum='cf3c49425119f627e92a69d43f9d869fdb1c56d6b152adb7853e6b138edd1eed'
+ARG version='3.17.7+190627'
+ARG sha256_checksum='fe76b1ed873d20f6fb113d12ef2557eda2ea7565388774506a29f31a9943cd3f'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -30,7 +30,7 @@ RUN set -ex; \
 ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
 
 RUN set -ex; \
-        echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
         \

fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.15.9+190214'
-ARG sha256_checksum='cf3c49425119f627e92a69d43f9d869fdb1c56d6b152adb7853e6b138edd1eed'
+ARG version='3.17.7+190627'
+ARG sha256_checksum='fe76b1ed873d20f6fb113d12ef2557eda2ea7565388774506a29f31a9943cd3f'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -17,7 +17,7 @@ RUN set -ex; \
         libpq-dev \
         netcat \
         \
-        && apt-get autoclean; apt-get autoremove; \
+        && apt-get -y autoclean; apt-get -y autoremove; \
         rm -rf /var/lib/apt/lists/*
 
 # Link LDAP library for PHP ldap extension
@@ -44,7 +44,7 @@ ENV LIMESURVEY_VERSION=$version
 ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
 
 RUN set -ex; \
-        echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/${version}.tar.gz" && \

makefile

@@ -0,0 +1,8 @@
+.PHONY: apache fpm fpm-alpine
+
+apache:
+	docker build --pull -t limesurvey:apache apache
+fpm-alpine:
+	docker build --pull -t limesurvey:fpm-alpine fpm-alpine
+fpm:
+	docker build --pull -t limesurvey:fpm fpm

upgrade.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # Upgrade script
 
+set -x
+
 if [ $# -eq 0 ]
   then
       echo 'Pass new LimeSurvey Version tag:'
@@ -20,7 +22,8 @@ fi
 
 # Download, unzip and chmod LimeSurvey from official GitHub repository
 wget -P /tmp "https://github.com/LimeSurvey/LimeSurvey/archive/${NEW_VERSION}.tar.gz"
-SHA256_CHECKSUM=$(sha256 "${NEW_VERSION}.tar.gz")
+
+SHA256_CHECKSUM=$(sha256sum "/tmp/${NEW_VERSION}.tar.gz" | awk '{ print $1 }')
 
 # Update lines in the files
 sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" apache/Dockerfile fpm/Dockerfile fpm-alpine/Dockerfile