Compare commits

...

12 Commits

Author SHA1 Message Date
Markus Opolka
c90840d414 Upgrading to LTS Version 3.24.6+201109 2020-11-16 10:39:33 +01:00
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
11 changed files with 41 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
FROM php:7.2-apache FROM php:7.4-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.24.2+201020' ARG version='3.24.6+201109'
ARG sha256_checksum='906b07f3ca325c3a7219317e0b4558dfa3b4702917b23098689fd9905790436f' ARG sha256_checksum='3e505ed3edc60011583bf373f4fefe87ecefc882e062805efe4156821d0bbae1'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
libldap2-dev \ libldap2-dev \
libfreetype6-dev \ libfreetype6-dev \
libjpeg-dev \ libjpeg-dev \
libonig-dev \
zlib1g-dev \ zlib1g-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
netcat \ netcat \
\ \
&& apt-get -y autoclean; apt-get -y autoremove; \ && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ 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-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \

View File

@@ -1,22 +1,24 @@
FROM php:7.2-fpm-alpine FROM php:7.4-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.24.2+201020' ARG version='3.24.6+201109'
ARG sha256_checksum='906b07f3ca325c3a7219317e0b4558dfa3b4702917b23098689fd9905790436f' ARG sha256_checksum='3e505ed3edc60011583bf373f4fefe87ecefc882e062805efe4156821d0bbae1'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
freetype-dev \ freetype-dev \
libpng-dev \ libpng-dev \
libzip-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
openldap-dev \ openldap-dev \
oniguruma-dev \
imap-dev \ imap-dev \
postgresql-dev && \ postgresql-dev && \
apk add --no-cache netcat-openbsd bash apk add --no-cache netcat-openbsd bash
# Install PHP Plugins # Install PHP Plugins
RUN set -ex; \ 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-configure imap --with-imap-ssl && \
docker-php-ext-install \ docker-php-ext-install \
gd \ gd \

View File

@@ -1,7 +1,7 @@
FROM php:7.2-fpm FROM php:7.4-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.24.2+201020' ARG version='3.24.6+201109'
ARG sha256_checksum='906b07f3ca325c3a7219317e0b4558dfa3b4702917b23098689fd9905790436f' ARG sha256_checksum='3e505ed3edc60011583bf373f4fefe87ecefc882e062805efe4156821d0bbae1'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
libldap2-dev \ libldap2-dev \
libfreetype6-dev \ libfreetype6-dev \
libjpeg-dev \ libjpeg-dev \
libonig-dev \
zlib1g-dev \ zlib1g-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
netcat \ netcat \
\ \
&& apt-get -y autoclean; apt-get -y autoremove; \ && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ 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-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \

View File

@@ -1,7 +1,7 @@
FROM php:7.2-apache FROM php:7.4-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.3.21+201015' ARG version='4.3.25+201105'
ARG sha256_checksum='932e6429bf5fa78792ff35d57fb55c3a8aa38562a3ec3fdecd4a7d3f34ad6b06' ARG sha256_checksum='36c3fcbff0dd3c2d0f3b5bf8d2aee62cad4a82c0ad06ca44681f505683f42d16'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
libldap2-dev \ libldap2-dev \
libfreetype6-dev \ libfreetype6-dev \
libjpeg-dev \ libjpeg-dev \
libonig-dev \
zlib1g-dev \ zlib1g-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
netcat \ netcat \
curl \ curl \
\ \
@@ -29,7 +31,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ 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-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \

View File

@@ -1,22 +1,24 @@
FROM php:7.2-fpm-alpine FROM php:7.4-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.3.21+201015' ARG version='4.3.25+201105'
ARG sha256_checksum='932e6429bf5fa78792ff35d57fb55c3a8aa38562a3ec3fdecd4a7d3f34ad6b06' ARG sha256_checksum='36c3fcbff0dd3c2d0f3b5bf8d2aee62cad4a82c0ad06ca44681f505683f42d16'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
freetype-dev \ freetype-dev \
libpng-dev \ libpng-dev \
libzip-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
openldap-dev \ openldap-dev \
oniguruma-dev \
imap-dev \ imap-dev \
postgresql-dev && \ postgresql-dev && \
apk add --no-cache netcat-openbsd bash apk add --no-cache netcat-openbsd bash
# Install PHP Plugins # Install PHP Plugins
RUN set -ex; \ 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-configure imap --with-imap-ssl && \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

View File

@@ -1,7 +1,7 @@
FROM php:7.2-fpm FROM php:7.4-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.3.21+201015' ARG version='4.3.25+201105'
ARG sha256_checksum='932e6429bf5fa78792ff35d57fb55c3a8aa38562a3ec3fdecd4a7d3f34ad6b06' ARG sha256_checksum='36c3fcbff0dd3c2d0f3b5bf8d2aee62cad4a82c0ad06ca44681f505683f42d16'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
libldap2-dev \ libldap2-dev \
libfreetype6-dev \ libfreetype6-dev \
libjpeg-dev \ libjpeg-dev \
libonig-dev \
zlib1g-dev \ zlib1g-dev \
libc-client-dev \ libc-client-dev \
libkrb5-dev \ libkrb5-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
netcat \ netcat \
\ \
&& apt-get -y autoclean; apt-get -y autoremove; \ && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ 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-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \

View File

@@ -6,7 +6,7 @@ services:
environment: environment:
- DB_TYPE=pgsql - DB_TYPE=pgsql
- DB_PORT=5432 - DB_PORT=5432
- DB_HOST=limesurvey_db_1.limesurvey_default - DB_HOST=db
- DB_PASSWORD=example - DB_PASSWORD=example
- DB_NAME=limesurvey - DB_NAME=limesurvey
- DB_USERNAME=limesurvey - DB_USERNAME=limesurvey

View File

@@ -12,7 +12,7 @@ services:
depends_on: depends_on:
- lime-db - lime-db
environment: environment:
- "DB_HOST=docker-limesurvey_lime-db_1" - "DB_HOST=lime-db"
- "DB_PASSWORD=secret" - "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar" - "ADMIN_PASSWORD=foobar"
lime-web: lime-web:

View File

@@ -12,7 +12,7 @@ services:
depends_on: depends_on:
- lime-db - lime-db
environment: environment:
- "DB_HOST=docker-limesurvey_lime-db_1" - "DB_HOST=lime-db"
- "DB_PASSWORD=secret" - "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar" - "ADMIN_PASSWORD=foobar"
lime-web: lime-web:

View File

@@ -15,7 +15,7 @@ services:
environment: environment:
- "DB_TYPE=pgsql" - "DB_TYPE=pgsql"
- "DB_PORT=5432" - "DB_PORT=5432"
- "DB_HOST=docker-limesurvey_lime-db_1" - "DB_HOST=lime-db"
- "DB_PASSWORD=secret" - "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar" - "ADMIN_PASSWORD=foobar"
lime-db: lime-db:

View File

@@ -13,7 +13,7 @@ services:
ports: ports:
- "8080:80" - "8080:80"
environment: environment:
- "DB_HOST=docker-limesurvey_lime-db_1" - "DB_HOST=lime-db"
- "DB_PASSWORD=secret" - "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar" - "ADMIN_PASSWORD=foobar"
lime-db: lime-db: