From 33db684562bdf3625f60bfcc412aaf641366b5bd Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 23 Jul 2017 13:57:22 +0200 Subject: [PATCH 1/4] add Dockerfile --- docker/Dockerfile | 25 ++++++++++++++++++++ docker/docker-entrypoint.sh | 47 +++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 docker/Dockerfile create mode 100755 docker/docker-entrypoint.sh diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..6c67aa3c --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,25 @@ +FROM php:7.0-apache + +# Install required PHP extensions +RUN docker-php-ext-install mysqli + +VOLUME /var/www/html + +ENV POSTFIXADMIN_VERSION 3.1 +ENV POSTFIXADMIN_SHA512 3bda4e9d4a7308d22edca30d181af76b7153e57b19bda878e32f5eeeb49127f46581c966706bcca13cd31740cadacc584e15830aa157b4655e60d44d66f45ddd + +RUN set -eux; \ + curl -o postfixadmin.tar.gz -SL "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \ + echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \ + # upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/ + tar -xzf postfixadmin.tar.gz -C /usr/src/; \ + mv /usr/src/postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION} /usr/src/postfixadmin; \ + rm postfixadmin.tar.gz; \ + # Does not exist in tarball but is required + mkdir -p /usr/src/postfixadmin/templates_c; \ + chown -R www-data:www-data /usr/src/postfixadmin + +COPY docker-entrypoint.sh /usr/local/bin/ + +ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] +CMD ["apache2-foreground"] diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh new file mode 100755 index 00000000..50419ffb --- /dev/null +++ b/docker/docker-entrypoint.sh @@ -0,0 +1,47 @@ +#!/bin/bash +set -ex + +if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then + if ! [ -e index.php -a -e scripts/postfixadmin-cli.php ]; then + echo >&2 "Postfixadmin not found in $PWD - copying now..." + if [ "$(ls -A)" ]; then + echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" + ( set -x; ls -A; sleep 10 ) + fi + tar cf - --one-file-system -C /usr/src/postfixadmin . | tar xf - + echo >&2 "Complete! Postfixadmin has been successfully copied to $PWD" + fi + + if [ -n "${!MYSQL_ENV_MYSQL_*}" ]; then + : "${POSTFIXADMIN_DB_TYPE:=mysqli}" + : "${POSTFIXADMIN_DB_HOST:=mysql}" + : "${POSTFIXADMIN_DB_USER:=${MYSQL_ENV_MYSQL_USER:-root}}" + if [ "$POSTFIXADMIN_DB_USER" = 'root' ]; then + : "${POSTFIXADMIN_DB_PASSWORD:=${MYSQL_ENV_MYSQL_ROOT_PASSWORD}}" + else + : "${POSTFIXADMIN_DB_PASSWORD:=${MYSQL_ENV_MYSQL_PASSWORD}}" + fi + : "${POSTFIXADMIN_DB_NAME:=${MYSQL_ENV_MYSQL_DATABASE:postfix}}" + fi + + if [ ! -e config.local.php ]; then + touch config.local.php + echo "Write config to $PWD/config.local.php" + echo "" | tee config.local.php + else + echo "WARNING: $PWD/config.local.php already exists." + echo "Postfixadmin related environment variables have been ignored." + fi +fi + +exec "$@" From dbe8475ed2332df54d745997c33841f36fc5d609 Mon Sep 17 00:00:00 2001 From: jowi Date: Thu, 24 Aug 2017 03:25:28 +0200 Subject: [PATCH 2/4] pgsql support (wip) --- docker/Dockerfile | 6 +++++- docker/docker-entrypoint.sh | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6c67aa3c..360c9a0a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,11 @@ FROM php:7.0-apache # Install required PHP extensions -RUN docker-php-ext-install mysqli +RUN buildDeps='libpq-dev' \ + && apt-get update && apt-get install -y --no-install-recommends $buildDeps \ + && docker-php-ext-install mysqli pgsql \ + && apt-get purge -y --auto-remove $buildDeps \ + && apt-get clean && rm -rf /var/lib/apt/lists/* \ VOLUME /var/www/html diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 50419ffb..de90efdd 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -12,6 +12,14 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then echo >&2 "Complete! Postfixadmin has been successfully copied to $PWD" fi + if [ -n "${!POSTGRES_ENV_POSTGRES_*}" ]; then + : "${POSTFIXADMIN_DB_TYPE:=pgsql}" + : "${POSTFIXADMIN_DB_HOST:=postgres}" + : "${POSTFIXADMIN_DB_USER:=${POSTGRES_ENV_POSTGRES_USER}}" + : "${POSTFIXADMIN_DB_PASSWORD:=${POSTGRES_ENV_POSTGRES_PASSWORD:-}}" + : "${POSTFIXADMIN_DB_NAME:=${POSTGRES_ENV_POSTGRES_DB:-}}" + fi + if [ -n "${!MYSQL_ENV_MYSQL_*}" ]; then : "${POSTFIXADMIN_DB_TYPE:=mysqli}" : "${POSTFIXADMIN_DB_HOST:=mysql}" From ec2cc0041e38111890c31f7134a089d49ae0d8a5 Mon Sep 17 00:00:00 2001 From: jowi Date: Mon, 18 Sep 2017 02:58:12 +0200 Subject: [PATCH 3/4] fix postgres dependency --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 360c9a0a..fd8b3178 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,6 +4,7 @@ FROM php:7.0-apache RUN buildDeps='libpq-dev' \ && apt-get update && apt-get install -y --no-install-recommends $buildDeps \ && docker-php-ext-install mysqli pgsql \ + && apt-mark manual libpq5 \ && apt-get purge -y --auto-remove $buildDeps \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ From 39dca798793f42586592b5f933e60bc0aa413de7 Mon Sep 17 00:00:00 2001 From: jowi Date: Thu, 21 Sep 2017 23:09:38 +0200 Subject: [PATCH 4/4] Add SQLite and PDO support --- docker/Dockerfile | 8 ++++---- docker/docker-entrypoint.sh | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index fd8b3178..791f85af 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,19 +1,19 @@ FROM php:7.0-apache # Install required PHP extensions -RUN buildDeps='libpq-dev' \ +RUN buildDeps='libpq-dev libsqlite3-dev' \ && apt-get update && apt-get install -y --no-install-recommends $buildDeps \ - && docker-php-ext-install mysqli pgsql \ + && docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql pdo_sqlite pgsql \ && apt-mark manual libpq5 \ && apt-get purge -y --auto-remove $buildDeps \ - && apt-get clean && rm -rf /var/lib/apt/lists/* \ + && apt-get clean && rm -rf /var/lib/apt/lists/* VOLUME /var/www/html ENV POSTFIXADMIN_VERSION 3.1 ENV POSTFIXADMIN_SHA512 3bda4e9d4a7308d22edca30d181af76b7153e57b19bda878e32f5eeeb49127f46581c966706bcca13cd31740cadacc584e15830aa157b4655e60d44d66f45ddd -RUN set -eux; \ +RUN set -eu; \ curl -o postfixadmin.tar.gz -SL "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \ echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \ # upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/ diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index de90efdd..ef906261 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -32,6 +32,14 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then : "${POSTFIXADMIN_DB_NAME:=${MYSQL_ENV_MYSQL_DATABASE:postfix}}" fi + if [ "$POSTFIXADMIN_DB_TYPE" = 'sqlite' ]; then + : "${POSTFIXADMIN_DB_NAME:=/var/local/postfixadmin.db}" + + if [ ! -e "$POSTFIXADMIN_DB_NAME" ]; then + touch $POSTFIXADMIN_DB_NAME + fi + fi + if [ ! -e config.local.php ]; then touch config.local.php echo "Write config to $PWD/config.local.php"