Upgrading to Version 4.3.25+201105

Upgrading to LTS Version 3.24.5+201104
Upgrading to Version 4.3.24+201102
2025-12-06 16:39:11 +01:00 · 2020-11-10 07:37:10 +01:00 · 2020-11-10 07:35:55 +01:00 · 2020-11-05 07:27:51 +01:00 · 2020-11-05 07:26:37 +01:00 · 2020-11-03 11:29:55 +01:00
12 changed files with 43 additions and 29 deletions
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.0+201013'
-ARG sha256_checksum='5f38ea92379534fdc8b18161736e04b785115a54d3c373c5af47d6c27b37c75a'
+ARG version='3.24.5+201104'
+ARG sha256_checksum='f354e1d922f66075e084d83874e6bf859468d9ed9f72f8504d011db407527646'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -1,22 +1,24 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.0+201013'
-ARG sha256_checksum='5f38ea92379534fdc8b18161736e04b785115a54d3c373c5af47d6c27b37c75a'
+ARG version='3.24.5+201104'
+ARG sha256_checksum='f354e1d922f66075e084d83874e6bf859468d9ed9f72f8504d011db407527646'

 # Install OS dependencies
 RUN set -ex; \
        apk add --no-cache --virtual .build-deps \
        freetype-dev \
        libpng-dev \
+        libzip-dev \
        libjpeg-turbo-dev \
        openldap-dev \
+        oniguruma-dev \
        imap-dev \
        postgresql-dev && \
        apk add --no-cache netcat-openbsd bash

 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr ; \
+        docker-php-ext-configure gd && \
        docker-php-ext-configure imap --with-imap-ssl && \
        docker-php-ext-install \
        gd \
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.0+201013'
-ARG sha256_checksum='5f38ea92379534fdc8b18161736e04b785115a54d3c373c5af47d6c27b37c75a'
+ARG version='3.24.5+201104'
+ARG sha256_checksum='f354e1d922f66075e084d83874e6bf859468d9ed9f72f8504d011db407527646'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/4.0/apache/Dockerfile
+++ b/4.0/apache/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.20+201012'
-ARG sha256_checksum='448a0f54e0818bc971837a78a389bb0fd296f879a1078f1acd4637f0d9c37220'
+ARG version='4.3.25+201105'
+ARG sha256_checksum='36c3fcbff0dd3c2d0f3b5bf8d2aee62cad4a82c0ad06ca44681f505683f42d16'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        curl \
        \
@@ -29,7 +31,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/4.0/fpm-alpine/Dockerfile
+++ b/4.0/fpm-alpine/Dockerfile
@@ -1,22 +1,24 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.20+201012'
-ARG sha256_checksum='448a0f54e0818bc971837a78a389bb0fd296f879a1078f1acd4637f0d9c37220'
+ARG version='4.3.25+201105'
+ARG sha256_checksum='36c3fcbff0dd3c2d0f3b5bf8d2aee62cad4a82c0ad06ca44681f505683f42d16'

 # Install OS dependencies
 RUN set -ex; \
        apk add --no-cache --virtual .build-deps \
        freetype-dev \
        libpng-dev \
+        libzip-dev \
        libjpeg-turbo-dev \
        openldap-dev \
+        oniguruma-dev \
        imap-dev \
        postgresql-dev && \
        apk add --no-cache netcat-openbsd bash

 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr ; \
+        docker-php-ext-configure gd && \
        docker-php-ext-configure imap --with-imap-ssl && \
        docker-php-ext-install \
        exif \
--- a/4.0/fpm/Dockerfile
+++ b/4.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.20+201012'
-ARG sha256_checksum='448a0f54e0818bc971837a78a389bb0fd296f879a1078f1acd4637f0d9c37220'
+ARG version='4.3.25+201105'
+ARG sha256_checksum='36c3fcbff0dd3c2d0f3b5bf8d2aee62cad4a82c0ad06ca44681f505683f42d16'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -6,7 +6,7 @@ services:
    environment:
      - DB_TYPE=pgsql
      - DB_PORT=5432
-      - DB_HOST=limesurvey_db_1.limesurvey_default
+      - DB_HOST=db
      - DB_PASSWORD=example
      - DB_NAME=limesurvey
      - DB_USERNAME=limesurvey
--- a/docker-compose.fpm.alpine.yml
+++ b/docker-compose.fpm.alpine.yml
@@ -12,7 +12,7 @@ services:
    depends_on:
      - lime-db
    environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-web:
--- a/docker-compose.fpm.yml
+++ b/docker-compose.fpm.yml
@@ -12,7 +12,7 @@ services:
    depends_on:
      - lime-db
    environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-web:
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -15,7 +15,7 @@ services:
    environment:
      - "DB_TYPE=pgsql"
      - "DB_PORT=5432"
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-db:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
    ports:
      - "8080:80"
    environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-db:
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -31,3 +31,5 @@ sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" $MAJOR_VERSION/apache/D
 sed -r -i -e "s/[A-Fa-f0-9]{64}/$SHA256_CHECKSUM/" $MAJOR_VERSION/apache/Dockerfile $MAJOR_VERSION/fpm/Dockerfile $MAJOR_VERSION/fpm-alpine/Dockerfile

 # After that, check and commit
+echo "git add 3.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"
+echo "git add 4.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"
Author	SHA1	Message	Date
Markus Opolka	89f15d94ba	Upgrading to Version 4.3.25+201105	2020-11-10 07:37:10 +01:00
Markus Opolka	ab6da243fe	Upgrading to LTS Version 3.24.5+201104	2020-11-10 07:35:55 +01:00
Markus Opolka	ce54275ddd	Upgrading to Version 4.3.24+201102	2020-11-05 07:27:51 +01:00
Markus Opolka	b0b38440e4	Upgrading to LTS Version 3.24.4+201103	2020-11-05 07:26:37 +01:00
Markus Opolka	56b9a7e686	Merge pull request #44 from martialblog/php-upgrade Update Base Images to PHP 7.4	2020-11-03 11:29:55 +01:00
Markus Opolka	41a275a59d	Update Base Images to PHP 7.4	2020-11-03 10:43:39 +01:00
Markus Opolka	876145e009	Upgrading to Version 4.3.23+201026	2020-11-03 07:55:44 +01:00
Markus Opolka	4a9a8a9bc3	Upgrading to LTS Version 3.24.3+201027	2020-11-03 07:54:18 +01:00
Markus Opolka	a189f5eceb	Merge pull request #42 from jwhb/compose-services Simplify database host values with compose	2020-11-02 08:29:42 +01:00
jwhb	0c7e8947ca	Simplify database host values with compose	2020-10-31 16:07:59 +01:00
Markus Opolka	7912d765ad	Upgrading to Version 4.3.22+201019	2020-10-26 14:54:48 +01:00
Markus Opolka	245cd092ed	Upgrading to LTS Version 3.24.2+201020	2020-10-26 14:53:07 +01:00
Markus Opolka	c897f9efbe	Upgrading to Version 4.3.21+201015	2020-10-19 10:40:34 +02:00
Markus Opolka	ffe21eb987	Upgrading to LTS Version 3.24.1+201014	2020-10-19 10:39:39 +02:00
Markus Opolka	e4c997f148	Extend upgrade script - now shows commit message template	2020-10-19 10:39:18 +02:00