Compare commits

...

20 Commits

Author SHA1 Message Date
Markus Opolka
633893f9a8 Upgrading to Version 5.1.14+210927 2021-10-13 19:04:47 +02:00
Markus Opolka
3cc111f903 Upgrading to LTS Version 3.27.19+210928 2021-10-13 19:03:52 +02:00
Alex Sears
0d572c645c Update entrypoint to allow customization of MySQL engine (#96)
* Update entrypoint to allow customization of MySQL engine
* Update fpm images to customize MySQL engine
* Update README for MySQL engine values and default
2021-10-13 11:37:05 +02:00
Markus Opolka
bca073774f Upgrading to Version 5.1.13+210923 2021-09-28 08:33:24 +02:00
Markus Opolka
e580c1ef45 Upgrading to LTS Version 3.27.18+210921 2021-09-28 08:32:11 +02:00
Markus Opolka
abe42af3e2 Upgrading to Version 5.1.11+210920 2021-09-21 07:59:13 +02:00
Markus Opolka
8a8a8db556 Upgrading to LTS Version 3.27.17+210911 2021-09-21 07:58:39 +02:00
Lucas Benevides
7e3a9ad099 Include Hints to use in limesurvey 3. (#90)
This makes more clear for those who want to use the LTS version of limesurvey, that some adaptations are needed.
2021-09-15 14:04:21 +02:00
Markus Opolka
a57da625d7 Upgrading to Version 5.1.9+210912 2021-09-10 09:50:37 +02:00
Markus Opolka
87da3cea63 Upgrading to LTS Version 3.27.16+210909 2021-09-10 09:49:45 +02:00
Markus Opolka
b845a1d47f Upgrading to Version 5.1.7+210908 2021-09-08 09:19:00 +02:00
Markus Opolka
9d35a25170 Upgrading to LTS Version 3.27.15+210907 2021-09-08 09:17:34 +02:00
Markus Opolka
83b9ff0695 Upgrading to Version 5.1.5+210830 2021-09-07 10:03:09 +02:00
Markus Opolka
d12196e622 Upgrading to LTS Version 3.27.14+210831 2021-09-07 10:02:27 +02:00
Arjun Srivastava
9abf028503 Bug fixes for certbot-nginx config. (#87)
- added missing $ for variable
- removed ``"``` which lead to cert bot incorrrectly reading "-d example.com" as a whole as an argument, and throwing an error
2021-08-30 13:10:14 +02:00
Markus Opolka
b93f79bd4e Upgrading to Version 5.1.3+210817 2021-08-24 08:07:10 +02:00
Markus Opolka
cbae03e396 Upgrading to LTS Version 3.27.12+210816 2021-08-24 08:06:23 +02:00
Markus Opolka
5915942a26 Upgrading to Version 5.1.2+210813 2021-08-17 17:13:04 +02:00
Markus Opolka
57e3b84970 Upgrading to LTS Version 3.27.11+210809 2021-08-17 17:12:23 +02:00
Markus Opolka
70631e85bd Upgrading to Version 5.0.13+210804 2021-08-12 07:58:46 +02:00
15 changed files with 29 additions and 14 deletions

View File

@@ -1,7 +1,7 @@
FROM php:7.4-apache
LABEL maintainer="markus@martialblog.de"
ARG version='3.27.10+210803'
ARG sha256_checksum='c69889af28e8359e695d6769c0a1039c19bfc1daf8eadefa6fdff704d586ca82'
ARG version='3.27.19+210928'
ARG sha256_checksum='b52ea9ce679be02d97de7c997b43292e88f8195135233c725769c38f9e96d48f'
ARG USER=root
ARG LISTEN_PORT=80

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm-alpine
LABEL maintainer="markus@martialblog.de"
ARG version='3.27.10+210803'
ARG sha256_checksum='c69889af28e8359e695d6769c0a1039c19bfc1daf8eadefa6fdff704d586ca82'
ARG version='3.27.19+210928'
ARG sha256_checksum='b52ea9ce679be02d97de7c997b43292e88f8195135233c725769c38f9e96d48f'
# Install OS dependencies
RUN set -ex; \

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm
LABEL maintainer="markus@martialblog.de"
ARG version='3.27.10+210803'
ARG sha256_checksum='c69889af28e8359e695d6769c0a1039c19bfc1daf8eadefa6fdff704d586ca82'
ARG version='3.27.19+210928'
ARG sha256_checksum='b52ea9ce679be02d97de7c997b43292e88f8195135233c725769c38f9e96d48f'
# Install OS dependencies
RUN set -ex; \

View File

@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
DB_PASSWORD=${DB_PASSWORD:-}
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -106,6 +107,7 @@ return array(
'publicurl'=>'$PUBLIC_URL',
'debug'=>$DEBUG,
'debugsql'=>$DEBUG_SQL,
'mysqlEngine' => '$DB_MYSQL_ENGINE',
)
);

View File

@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
DB_PASSWORD=${DB_PASSWORD:-}
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -99,6 +100,7 @@ return array(
'publicurl'=>'$PUBLIC_URL',
'debug'=>$DEBUG,
'debugsql'=>$DEBUG_SQL,
'mysqlEngine' => '$DB_MYSQL_ENGINE',
)
);

View File

@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
DB_PASSWORD=${DB_PASSWORD:-}
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -99,6 +100,7 @@ return array(
'publicurl'=>'$PUBLIC_URL',
'debug'=>$DEBUG,
'debugsql'=>$DEBUG_SQL,
'mysqlEngine' => '$DB_MYSQL_ENGINE',
)
);

View File

@@ -1,7 +1,7 @@
FROM php:8-apache
LABEL maintainer="markus@martialblog.de"
ARG version='5.0.12+210729'
ARG sha256_checksum='fb39d81fefeebe4fbc0cd7fc9c3f656b073d39c15db5ac1d1ba443cbe7b722e7'
ARG version='5.1.14+210927'
ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
ARG USER=www-data
ARG LISTEN_PORT=8080

View File

@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
DB_PASSWORD=${DB_PASSWORD:-}
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -113,6 +114,7 @@ return array(
'publicurl'=>'$PUBLIC_URL',
'debug'=>$DEBUG,
'debugsql'=>$DEBUG_SQL,
'mysqlEngine' => '$DB_MYSQL_ENGINE',
)
);

View File

@@ -1,7 +1,7 @@
FROM php:8-fpm-alpine
LABEL maintainer="markus@martialblog.de"
ARG version='5.0.12+210729'
ARG sha256_checksum='fb39d81fefeebe4fbc0cd7fc9c3f656b073d39c15db5ac1d1ba443cbe7b722e7'
ARG version='5.1.14+210927'
ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
ARG USER=www-data
# Install OS dependencies

View File

@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
DB_PASSWORD=${DB_PASSWORD:-}
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -106,6 +107,7 @@ return array(
'publicurl'=>'$PUBLIC_URL',
'debug'=>$DEBUG,
'debugsql'=>$DEBUG_SQL,
'mysqlEngine' => '$DB_MYSQL_ENGINE',
)
);

View File

@@ -1,7 +1,7 @@
FROM php:8-fpm
LABEL maintainer="markus@martialblog.de"
ARG version='5.0.12+210729'
ARG sha256_checksum='fb39d81fefeebe4fbc0cd7fc9c3f656b073d39c15db5ac1d1ba443cbe7b722e7'
ARG version='5.1.14+210927'
ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
ARG USER=www-data
# Install OS dependencies

View File

@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
DB_PASSWORD=${DB_PASSWORD:-}
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -106,6 +107,7 @@ return array(
'publicurl'=>'$PUBLIC_URL',
'debug'=>$DEBUG,
'debugsql'=>$DEBUG_SQL,
'mysqlEngine' => '$DB_MYSQL_ENGINE',
)
);

View File

@@ -104,6 +104,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
| DB_SOCK | Database unix socket instead of host/port |
| DB_NAME | Database name |
| DB_TABLE_PREFIX | Database table prefix |
| DB_MYSQL_ENGINE | MySQL engine used for survey tables (values: MyISAM, InnoDB, default: MyISAM) |
| DB_USERNAME | Database user |
| DB_PASSWORD | Database user's password |
| ADMIN_USER | Initial LimeSurvey Admin User |

View File

@@ -2,6 +2,7 @@ version: "3.0"
services:
limesurvey:
build:
# Hint: Change it to 3.0/apache/ if you want to use LimeSurvey 3.*
context: 5.0/apache/
dockerfile: Dockerfile
volumes:
@@ -12,6 +13,7 @@ services:
depends_on:
- lime-db
ports:
# Hint: Change it to 80:8080 if you are using LimeSurvey 3.*
- "8080:8080"
environment:
- "DB_TYPE=pgsql"

View File

@@ -1,7 +1,7 @@
#!/bin/sh
cert_path=/etc/letsencrypt/live/$(echo "$HOSTNAMES" | awk '{print $1}')
mkdir -p cert_path
mkdir -p $cert_path
# if there is no certificate yet, get one
email="--email $CERT_EMAIL"
@@ -19,7 +19,7 @@ then
echo "Getting new certificate..."
/usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > /etc/letsencrypt/options-ssl-nginx.conf
/usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > /etc/letsencrypt/ssl-dhparams.pem
/usr/bin/certbot certonly --standalone "$names" --agree-tos "$email"
/usr/bin/certbot certonly --standalone $names --agree-tos "$email"
fi
nginx -g "daemon off;"