Upgrading to Version 4.4.16+210406

Upgrading to LTS Version 3.25.21+210407
Upgrading to Version 4.4.15+210329
2025-12-06 16:39:11 +01:00 · 2021-04-12 17:02:11 +02:00 · 2021-04-12 17:01:30 +02:00 · 2021-04-07 17:34:02 +02:00 · 2021-04-07 17:33:18 +02:00 · 2021-04-04 07:26:02 +02:00
10 changed files with 41 additions and 24 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,17 @@ sudo: required
 language: bash
 services:
  - docker
-
-matrix:
+install:
+jobs:
  include:
+    - env: HADOLINT="${HOME}/hadolint"
+      script:
+          - curl -sL -o ${HADOLINT} "https://github.com/hadolint/hadolint/releases/download/v1.23.0/hadolint-$(uname -s)-$(uname -m)"
+          - chmod 700 ${HADOLINT}
+          - git ls-files --exclude='Dockerfile*' --ignored | xargs --max-lines=1 ${HADOLINT} --ignore DL4006 --ignore DL3008 --ignore DL3018
    - env: TAG=martialblog/limesurvey-apache
-      script: cd 3.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 4.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
    - env: TAG=martialblog/limesurvey-fpm
-      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 4.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
    - env: TAG=martialblog/limesurvey-alpine
-      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 4.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.18+210316'
-ARG sha256_checksum='16c5b775ffe7cab778eb10ffe8723f45762e031ced4d254508a53f691dd9bd2d'
+ARG version='3.25.21+210407'
+ARG sha256_checksum='82e75fcc1d96fcca37d30d53faab091d496db752b98959e09f0fb39b4c31aa14'

 # Install OS dependencies
 RUN set -ex; \
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.18+210316'
-ARG sha256_checksum='16c5b775ffe7cab778eb10ffe8723f45762e031ced4d254508a53f691dd9bd2d'
+ARG version='3.25.21+210407'
+ARG sha256_checksum='82e75fcc1d96fcca37d30d53faab091d496db752b98959e09f0fb39b4c31aa14'

 # Install OS dependencies
 RUN set -ex; \
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.18+210316'
-ARG sha256_checksum='16c5b775ffe7cab778eb10ffe8723f45762e031ced4d254508a53f691dd9bd2d'
+ARG version='3.25.21+210407'
+ARG sha256_checksum='82e75fcc1d96fcca37d30d53faab091d496db752b98959e09f0fb39b4c31aa14'

 # Install OS dependencies
 RUN set -ex; \
--- a/4.0/apache/Dockerfile
+++ b/4.0/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.13+210315'
-ARG sha256_checksum='f6a6af245aa4a318c7fca66a1db76add3580cd0cb56e0c4a5b1516600f214152'
+ARG version='4.4.16+210406'
+ARG sha256_checksum='d499b65f2109c713cd9b992c4066d7bff004ee841557ec99c893c19d2ab80d37'

 # Install OS dependencies
 RUN set -ex; \
--- a/4.0/fpm-alpine/Dockerfile
+++ b/4.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.13+210315'
-ARG sha256_checksum='f6a6af245aa4a318c7fca66a1db76add3580cd0cb56e0c4a5b1516600f214152'
+ARG version='4.4.16+210406'
+ARG sha256_checksum='d499b65f2109c713cd9b992c4066d7bff004ee841557ec99c893c19d2ab80d37'

 # Install OS dependencies
 RUN set -ex; \
--- a/4.0/fpm/Dockerfile
+++ b/4.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.13+210315'
-ARG sha256_checksum='f6a6af245aa4a318c7fca66a1db76add3580cd0cb56e0c4a5b1516600f214152'
+ARG version='4.4.16+210406'
+ARG sha256_checksum='d499b65f2109c713cd9b992c4066d7bff004ee841557ec99c893c19d2ab80d37'

 # Install OS dependencies
 RUN set -ex; \
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -22,8 +22,10 @@ services:
    depends_on:
      - db
  db:
-    image: postgres:9.6-alpine
+    image: postgres:10-alpine
    restart: always
+    volumes:
+      - db-data:/var/lib/postgresql
    environment:
      - POSTGRES_USER=limesurvey
      - POSTGRES_DB=limesurvey
@@ -31,3 +33,4 @@ services:

 volumes:
  limesurvey:
+  db-data:
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -20,7 +20,12 @@ services:
      - "ADMIN_PASSWORD=foobar"
  lime-db:
    image: postgres:10
+    volumes:
+      - db-data:/var/lib/postgresql
    environment:
      - "POSTGRES_USER=limesurvey"
      - "POSTGRES_DB=limesurvey"
      - "POSTGRES_PASSWORD=secret"
+
+volumes:
+  db-data:
--- a/nginx-certbot/Dockerfile
+++ b/nginx-certbot/Dockerfile
@@ -1,10 +1,14 @@
-FROM nginx
-RUN apt-get update && \
-    apt-get install -y certbot curl python-certbot-nginx && \
-    apt-get -y autoclean; apt-get -y autoremove; \
-    rm -rf /var/lib/apt/lists/*
+FROM nginx:stable
+LABEL maintainer="markus@martialblog.de"
+
+RUN set -ex; \
+        apt-get update && \
+        DEBIAN_FRONTEND=noninteractive \
+        apt-get install --no-install-recommends -y \
+        certbot curl python-certbot-nginx && \
+        apt-get -y autoclean; apt-get -y autoremove; \
+        rm -rf /var/lib/apt/lists/*

 COPY entrypoint.sh /entrypoint.sh
 RUN chmod 700 /entrypoint.sh
-
 CMD ["/entrypoint.sh"]
Author	SHA1	Message	Date
Markus Opolka	0403aa1208	Upgrading to Version 4.4.16+210406	2021-04-12 17:02:11 +02:00
Markus Opolka	5a011e6818	Upgrading to LTS Version 3.25.21+210407	2021-04-12 17:01:30 +02:00
Markus Opolka	bb23531c6d	Upgrading to Version 4.4.15+210329	2021-04-07 17:34:02 +02:00
Markus Opolka	69e8bcec7e	Upgrading to LTS Version 3.25.20+210330	2021-04-07 17:33:18 +02:00
Markus Opolka	d26552bb6f	Merge pull request #55 from PabloCastellano/master Use docker volumes for postgres database	2021-04-04 07:26:02 +02:00
Pablo Castellano	1360fb8001	Use docker volumes for postgres database	2021-04-03 11:26:30 +02:00
Markus Opolka	fceae6b3cd	Upgrading to Version 4.4.14+210322	2021-03-30 08:00:45 +02:00
Markus Opolka	b62a83ac83	Upgrading to LTS Version 3.25.19+210323	2021-03-30 07:59:56 +02:00
Markus Opolka	d106c2ceb6	Merge pull request #53 from martialblog/hadolint Add Hadolint to CI	2021-03-22 20:14:46 +01:00
Markus Opolka	0c4690c97a	Add hadolint to CI	2021-03-22 20:06:08 +01:00
Markus Opolka	ebb51363a1	Optimise nginx certbot example Dockerfile	2021-03-22 20:05:30 +01:00