Compare commits

...

29 Commits

Author SHA1 Message Date
Markus Opolka
c30e0878e2 Upgrading to 3.17.0+190402 2019-04-10 18:51:43 +02:00
Markus Opolka
b44b4c2371 Merge pull request #16 from martialblog/checksum
Fix sha256sum check
2019-04-04 09:10:31 +02:00
Markus Opolka
c655c4cf53 Fix sha256sum check
- Its two spaces... TWO SPACES!
 - https://github.com/gliderlabs/docker-alpine/issues/174#issuecomment-222951567
2019-04-04 09:02:47 +02:00
Markus Opolka
6f088023ae Upgrading to Version 3.16.1+190314 2019-04-04 08:36:55 +02:00
Markus Opolka
6531d6131f Upgrading to Version 3.16.1+190225 2019-03-15 14:48:29 +01:00
Markus Opolka
92548e8d6f Fix upgrade script 2019-03-15 14:46:48 +01:00
Markus Opolka
07a9d72c17 Upgrading to Version 3.15.9+190214 2019-02-26 08:50:00 +01:00
Markus Opolka
fcb52d4114 Merge pull request #15 from martialblog/sha-refactor
Add SHA Checksum and better shell debugging
2019-02-19 11:25:19 +01:00
Markus Opolka
9dcf0c94ea Add shell upgrade script 2019-02-19 11:13:21 +01:00
Markus Opolka
97a2506d3d Remove Python upgrade script 2019-02-19 10:40:50 +01:00
Markus Opolka
90c03f7b92 Add sha256 check, shell debug log and PHP production config 2019-02-19 10:40:29 +01:00
Markus Opolka
27a563868d Upgrading to Version 3.15.8+190130 2019-02-15 09:16:01 +01:00
Markus Opolka
1e66840c63 Enable apache mods rewrite, header and remoteip
- To ensure proper Apache config is possible
2019-02-08 16:26:29 +01:00
Markus Opolka
88db810ec2 Upgrading to Version 3.15.7+190124 2019-01-30 17:24:52 +01:00
Markus Opolka
63f4fb4bbb Upgrading to Version 3.15.6+190108 2019-01-23 16:05:17 +01:00
Markus Opolka
5fc47ca735 Upgrading to Version 3.15.5+181115 2019-01-10 08:10:57 +01:00
Markus Opolka
980e145ea4 Upgrading to Version 3.15.3+181108 2018-11-09 13:23:21 +01:00
Markus Opolka
e978fd0717 Upgrading to Version 3.15.1+181017 2018-11-08 09:33:09 +01:00
Markus Opolka
2fa1f94b20 Upgrading to Version 3.15.0+181008 2018-10-18 10:09:20 +02:00
Markus Opolka
cf09eeba7c Upgrading to Version 3.14.10+180926 2018-10-09 08:12:57 +02:00
Markus Opolka
75f9c151a7 Upgrading to Version 3.14.10+180924 2018-09-27 09:27:09 +02:00
Markus Opolka
a5f3d91340 Upgrading to Version 3.14.9+180917 2018-09-26 07:50:38 +02:00
Markus Opolka
55c23248bd Upgrading to Version 3.14.8+180829 2018-09-17 17:44:00 +02:00
Markus Opolka
91ab6439de Merge pull request #14 from martialblog/unix-socket
Add socket check before waiting for database connection
2018-09-15 14:11:12 +02:00
Jack Henschel
b443ca12a7 Add socket check before waiting for database connection
database connection checking with netcat is only possible when
using a TCP/IP connection, just launch the application when the
user chooses a unix socket
2018-09-14 13:41:47 +02:00
Markus Opolka
a05a2528c6 Merge pull request #13 from martialblog/unix-socket
Add option to use unix_socket instead of tcp connection for DB
2018-09-14 09:44:32 +02:00
Jack Henschel
610c377680 Add option to use unix_socket instead of tcp connection for DB 2018-09-14 09:21:04 +02:00
Markus Opolka
cc34159e53 Upgrading to Version 3.14.7+180827 2018-08-31 11:09:42 +02:00
Markus Opolka
cc6937054e Upgrading to Version 3.14.6+180821 2018-08-28 11:02:29 +02:00
10 changed files with 209 additions and 169 deletions

View File

@@ -48,6 +48,7 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
| DB_TYPE | Database Type to use. mysql or pgsql |
| DB_HOST | Database server hostname |
| DB_PORT | Database server port |
| DB_SOCK | Database unix socket instead of host/port |
| DB_NAME | Database name |
| DB_TABLE_PREFIX | Database table prefix |
| DB_USERNAME | Database user |

View File

@@ -1,45 +1,69 @@
FROM php:7.2-apache
LABEL maintainer="markus@martialblog.de"
ARG version='3.14.5+180815'
ARG version='3.17.0+190402'
ARG sha256_checksum='30743b418c0fddec50291620026d398c4f0cbb36e61e7dbd77691ea97566770f'
# Install OS dependencies
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \
libldap2-dev \
zlib1g-dev \
libc-client-dev \
libkrb5-dev \
libpng-dev \
libpq-dev \
netcat \
&& apt-get autoclean; apt-get autoremove && \
rm -rf /var/lib/apt/lists/*
RUN set -ex; \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \
\
libldap2-dev \
zlib1g-dev \
libc-client-dev \
libkrb5-dev \
libpng-dev \
libpq-dev \
netcat \
\
&& apt-get autoclean; apt-get autoremove; \
rm -rf /var/lib/apt/lists/*
# Link LDAP library for PHP ldap extension
RUN ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
# Configure PHP imap plugin
RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl
RUN set -ex; \
ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
# Install PHP Plugins
RUN docker-php-ext-install -j5 \
gd \
imap \
ldap \
mbstring \
pdo \
pdo_mysql \
pdo_pgsql \
pgsql \
zip
# Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \
gd \
imap \
ldap \
mbstring \
pdo \
pdo_mysql \
pdo_pgsql \
pgsql \
zip
# Download, unzip and chmod of LimeSurvey
ENV LIMESURVEY_VERSION=$version
# Apache configuration
RUN a2enmod headers rewrite remoteip; \
{\
echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
# Download, unzip and chmod LimeSurvey from official GitHub repository
ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
RUN tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
rm "/tmp/${version}.tar.gz" && \
chown -R www-data:www-data /var/www/html
RUN set -ex; \
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" && \
chown -R www-data:www-data /var/www/html
COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["apache2-foreground"]

View File

@@ -5,6 +5,7 @@
DB_TYPE=${DB_TYPE:-'mysql'}
DB_HOST=${DB_HOST:-'mysql'}
DB_PORT=${DB_PORT:-'3306'}
DB_SOCK=${DB_SOCK:-}
DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}
# Check if database is available
until nc -z -v -w30 $DB_HOST $DB_PORT
do
echo "Info: Waiting for database connection..."
sleep 5
done
if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT
do
echo "Info: Waiting for database connection..."
sleep 5
done
fi
# Check if already provisioned
@@ -46,7 +49,14 @@ else
fi
# Set Database config
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
if [ ! -z "$DB_SOCK" ]; then
echo 'Info: Using unix socket'
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
else
echo 'Info: Using TCP connection'
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
fi
sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php

View File

@@ -1,38 +1,45 @@
FROM php:7.2-fpm-alpine
LABEL maintainer="markus@martialblog.de"
ARG version='3.14.5+180815'
ARG version='3.17.0+190402'
ARG sha256_checksum='30743b418c0fddec50291620026d398c4f0cbb36e61e7dbd77691ea97566770f'
# Install OS dependencies
RUN apk add --no-cache --virtual .build-deps \
libpng-dev \
openldap-dev \
imap-dev \
postgresql-dev && \
apk add --no-cache netcat-openbsd bash
RUN set -ex; \
apk add --no-cache --virtual .build-deps \
libpng-dev \
openldap-dev \
imap-dev \
postgresql-dev && \
apk add --no-cache netcat-openbsd bash
# Install PHP Plugins
RUN docker-php-ext-configure imap --with-imap-ssl && \
docker-php-ext-install \
gd \
imap \
ldap \
mbstring \
pdo \
pdo_mysql \
pdo_pgsql \
pgsql \
zip
RUN set -ex; \
docker-php-ext-configure imap --with-imap-ssl && \
docker-php-ext-install \
gd \
imap \
ldap \
mbstring \
pdo \
pdo_mysql \
pdo_pgsql \
pgsql \
zip
# Download, unzip and chmod of LimeSurvey
ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
RUN tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
rm -rf "/tmp/${version}.tar.gz" \
/var/www/html/docs \
/var/www/html/tests \
/var/www/html/*.md && \
chown -R www-data:root /var/www/ ; \
chmod -R g=u /var/www
RUN set -ex; \
echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
\
tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
\
rm -rf "/tmp/${version}.tar.gz" \
/var/www/html/docs \
/var/www/html/tests \
/var/www/html/*.md && \
chown -R www-data:root /var/www/ ; \
chmod -R g=u /var/www
EXPOSE 9000

View File

@@ -1,10 +1,11 @@
#!/bin/sh
#!/bin/bash
# Entrypoint for Docker Container
DB_TYPE=${DB_TYPE:-'mysql'}
DB_HOST=${DB_HOST:-'mysql'}
DB_PORT=${DB_PORT:-'3306'}
DB_SOCK=${DB_SOCK:-}
DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}
# Check if database is available
until nc -z -v -w30 $DB_HOST $DB_PORT
do
echo "Info: Waiting for database connection..."
sleep 5
done
if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT
do
echo "Info: Waiting for database connection..."
sleep 5
done
fi
# Check if already provisioned
@@ -46,7 +49,14 @@ else
fi
# Set Database config
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
if [ ! -z "$DB_SOCK" ]; then
echo 'Info: Using unix socket'
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
else
echo 'Info: Using TCP connection'
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
fi
sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php

View File

@@ -1,44 +1,54 @@
FROM php:7.2-fpm
LABEL maintainer="markus@martialblog.de"
ARG version='3.14.5+180815'
ARG version='3.17.0+190402'
ARG sha256_checksum='30743b418c0fddec50291620026d398c4f0cbb36e61e7dbd77691ea97566770f'
# Install OS dependencies
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \
libldap2-dev \
zlib1g-dev \
libc-client-dev \
libkrb5-dev \
libpng-dev \
libpq-dev \
netcat \
&& apt-get autoclean; apt-get autoremove && \
rm -rf /var/lib/apt/lists/*
RUN set -ex; \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \
\
libldap2-dev \
zlib1g-dev \
libc-client-dev \
libkrb5-dev \
libpng-dev \
libpq-dev \
netcat \
\
&& apt-get autoclean; apt-get autoremove; \
rm -rf /var/lib/apt/lists/*
# Link LDAP library for PHP ldap extension
RUN ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
RUN set -ex; \
ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl
# Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \
gd \
imap \
ldap \
mbstring \
pdo \
pdo_mysql \
pdo_pgsql \
pgsql \
zip
# Install PHP Plugins
RUN docker-php-ext-install -j5 \
gd \
imap \
ldap \
mbstring \
pdo \
pdo_mysql \
pdo_pgsql \
pgsql \
zip
ENV LIMESURVEY_VERSION=$version
# Download, unzip and chmod of LimeSurvey
# Download, unzip and chmod LimeSurvey from official GitHub repository
ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
RUN tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
rm "/tmp/${version}.tar.gz" && \
chown -R www-data:www-data /var/www/html
RUN set -ex; \
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" && \
chown -R www-data:www-data /var/www/html
EXPOSE 9000

View File

@@ -5,6 +5,7 @@
DB_TYPE=${DB_TYPE:-'mysql'}
DB_HOST=${DB_HOST:-'mysql'}
DB_PORT=${DB_PORT:-'3306'}
DB_SOCK=${DB_SOCK:-}
DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
@@ -20,11 +21,13 @@ URL_FORMAT=${URL_FORMAT:-'path'}
# Check if database is available
until nc -z -v -w30 $DB_HOST $DB_PORT
do
echo "Info: Waiting for database connection..."
sleep 5
done
if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT
do
echo "Info: Waiting for database connection..."
sleep 5
done
fi
# Check if already provisioned
@@ -46,7 +49,14 @@ else
fi
# Set Database config
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
if [ ! -z "$DB_SOCK" ]; then
echo 'Info: Using unix socket'
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
else
echo 'Info: Using TCP connection'
sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
fi
sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php

View File

@@ -1 +0,0 @@
feedparser==5.2.1

View File

@@ -1,63 +0,0 @@
#!/usr/bin/env python3
import argparse
import feedparser
import sys
import subprocess
dockerfile_apache = 'apache/Dockerfile'
dockerfile_fpm = 'fpm/Dockerfile'
dockerfile_alpine = 'fpm-alpine/Dockerfile'
limesv_feed_url = 'https://github.com/LimeSurvey/LimeSurvey/releases.atom'
docker_feed_url = 'https://github.com/martialblog/docker-limesurvey/releases.atom'
limesv_feed = feedparser.parse(limesv_feed_url)
docker_feed = feedparser.parse(docker_feed_url)
limesv_current_release = limesv_feed.entries[0].title_detail.value
docker_current_release = docker_feed.entries[0].title_detail.value
argumentparser = argparse.ArgumentParser(description='Updates the LimeSurvey Version in the Dockerfiles')
argumentparser.add_argument('--noop', dest='noop', action="store_true", required=False, help="Don't push just commit")
argumentparser.add_argument('--check', dest='check', action="store_true", required=False, help="Only check if there's a new version available")
cmdargs = argumentparser.parse_args()
if limesv_current_release == docker_current_release:
print('Nothing to do.')
sys.exit(0)
print('New Version {} available.'.format(limesv_current_release))
if cmdargs.check:
sys.exit(0)
commit_message = 'Updating to Version {}'.format(limesv_current_release)
# Dockerfiles
regexp = 's/[0-9]+\.[0-9]+\.[0-9]+[0-9]*/{new_version}/'.format(new_version=limesv_current_release)
subprocess.call(['sed', '-i', '-e', regexp, dockerfile_apache])
subprocess.call(['sed', '-i', '-e', regexp, dockerfile_fpm])
subprocess.call(['sed', '-i', '-e', regexp, dockerfile_alpine])
print('> Updated Dockerfiles')
# Git Commit/Tag
# subprocess.call(['git', 'checkout', '-b', limesv_current_release])
subprocess.call(['git', 'add', dockerfile_apache])
subprocess.call(['git', 'add', dockerfile_fpm])
subprocess.call(['git', 'commit', '-m', commit_message])
subprocess.call(['git', 'tag', limesv_current_release])
print('> Created new Commit and Tag')
if cmdargs.noop:
sys.exit(0)
# Git Push
# subprocess.call(['git', 'push', 'origin', limesv_current_release])
subprocess.call(['git', 'push'])
subprocess.call(['git', 'push', 'origin', '--tags'])
print('> Pushed to new Branch')
sys.exit(0)

32
upgrade.sh Executable file
View File

@@ -0,0 +1,32 @@
#!/usr/bin/env bash
# Upgrade script
set -x
if [ $# -eq 0 ]
then
echo 'Pass new LimeSurvey Version tag:'
echo 'upgrade.sh 3.15.8+190130'
exit 1
fi
NEW_VERSION=$1
grep -qc $NEW_VERSION apache/Dockerfile fpm/Dockerfile fpm-alpine/Dockerfile
if [ $? -eq 0 ]
then
echo "Already at version ${NEW_VERSION}"
exit 0
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=$(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
sed -r -i -e "s/[A-Fa-f0-9]{64}/$SHA256_CHECKSUM/" apache/Dockerfile fpm/Dockerfile fpm-alpine/Dockerfile
# After that, check and commit