From 0d13763a47db921ae4e8b952ba2aebf4875ee635 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Tue, 7 Jun 2022 17:39:05 +0200 Subject: [PATCH] Remove LimeSurvey 4.0 Dockerfiles - No longer supported, replaced by 5.0 --- 4.0/apache/Dockerfile | 83 ------------------- 4.0/apache/entrypoint.sh | 154 ----------------------------------- 4.0/fpm-alpine/Dockerfile | 59 -------------- 4.0/fpm-alpine/entrypoint.sh | 147 --------------------------------- 4.0/fpm/Dockerfile | 68 ---------------- 4.0/fpm/entrypoint.sh | 147 --------------------------------- CONTRIBUTING.md | 10 +-- 7 files changed, 5 insertions(+), 663 deletions(-) delete mode 100644 4.0/apache/Dockerfile delete mode 100755 4.0/apache/entrypoint.sh delete mode 100644 4.0/fpm-alpine/Dockerfile delete mode 100755 4.0/fpm-alpine/entrypoint.sh delete mode 100644 4.0/fpm/Dockerfile delete mode 100755 4.0/fpm/entrypoint.sh diff --git a/4.0/apache/Dockerfile b/4.0/apache/Dockerfile deleted file mode 100644 index b583641..0000000 --- a/4.0/apache/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -FROM php:8.0-apache -LABEL maintainer="markus@martialblog.de" -ARG version="4.6.3+210518" -ARG sha256_checksum="3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2" -ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" -ARG USER=root -ARG LISTEN_PORT=80 - -# Install OS dependencies -RUN set -ex; \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install --no-install-recommends -y \ - \ - libldap2-dev \ - libfreetype6-dev \ - libjpeg-dev \ - libonig-dev \ - zlib1g-dev \ - libc-client-dev \ - libkrb5-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libtidy-dev \ - libsodium-dev \ - netcat \ - curl \ - \ - && apt-get -y autoclean; apt-get -y autoremove; \ - rm -rf /var/lib/apt/lists/* - -# Link LDAP library for PHP ldap extension -RUN set -ex; \ - ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/ - -# Install PHP Plugins and Configure PHP imap plugin -RUN set -ex; \ - docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ - docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ - docker-php-ext-install -j5 \ - exif \ - gd \ - imap \ - ldap \ - mbstring \ - pdo \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - sodium \ - tidy \ - zip - -ENV LIMESURVEY_VERSION=$version - -# Apache configuration -RUN a2enmod headers rewrite remoteip; \ - {\ - echo RemoteIPHeader X-Real-IP ;\ - echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ - echo RemoteIPTrustedProxy 172.16.0.0/12 ;\ - echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ - } > /etc/apache2/conf-available/remoteip.conf;\ - a2enconf remoteip - -# Use the default production configuration -RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" - -# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) -RUN set -ex; \ - curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ - echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ - \ - tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \ - rm -f "/tmp/limesurvey.tar.gz" && \ - chown -R www-data:www-data /var/www/html /etc/apache2 - -WORKDIR /var/www/html -COPY entrypoint.sh entrypoint.sh -USER $USER -ENTRYPOINT ["/var/www/html/entrypoint.sh"] -CMD ["apache2-foreground"] diff --git a/4.0/apache/entrypoint.sh b/4.0/apache/entrypoint.sh deleted file mode 100755 index a48afb9..0000000 --- a/4.0/apache/entrypoint.sh +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/bash -# Entrypoint for Docker Container - - -DB_TYPE=${DB_TYPE:-'mysql'} -DB_HOST=${DB_HOST:-'mysql'} -DB_PORT=${DB_PORT:-'3306'} -DB_SOCK=${DB_SOCK:-} -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:-} -ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-} - -ADMIN_USER=${ADMIN_USER:-'admin'} -ADMIN_NAME=${ADMIN_NAME:-'admin'} -ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} -ADMIN_PASSWORD=${ADMIN_PASSWORD:-} - -BASE_URL=${BASE_URL:-} -PUBLIC_URL=${PUBLIC_URL:-} -URL_FORMAT=${URL_FORMAT:-'path'} - -DEBUG=${DEBUG:-0} -DEBUG_SQL=${DEBUG_SQL:-0} - -LISTEN_PORT=${LISTEN_PORT:-"80"} - -if [ -z "$DB_PASSWORD" ]; then - echo >&2 'Error: Missing DB_PASSWORD' - exit 1 -fi - -if [ -z "$ADMIN_PASSWORD" ]; then - echo >&2 'Error: Missing ADMIN_PASSWORD' - exit 1 -fi - -if [ "$LISTEN_PORT" != "80" ]; then - echo "Info: Customizing Apache Listen port to $LISTEN_PORT" - sed -i "s/Listen 80\$/Listen $LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf -fi - -# Check if database is available -if [ -z "$DB_SOCK" ]; then - until nc -z -v -w30 "$DB_HOST" "$DB_PORT" - do - echo "Info: Waiting for database connection..." - sleep 5 - done -fi - -# Check if config already provisioned -if [ -f application/config/config.php ]; then - echo 'Info: config.php already provisioned' -else - echo 'Info: Generating config.php' - - if [ "$DB_TYPE" = 'mysql' ]; then - echo 'Info: Using MySQL configuration' - DB_CHARSET=${DB_CHARSET:-'utf8mb4'} - fi - - if [ "$DB_TYPE" = 'pgsql' ]; then - echo 'Info: Using PostgreSQL configuration' - DB_CHARSET=${DB_CHARSET:-'utf8'} - fi - - if [ -n "$DB_SOCK" ]; then - echo 'Info: Using unix socket' - DB_CONNECT='unix_socket' - else - echo 'Info: Using TCP connection' - DB_CONNECT='host' - fi - - if [ -z "$PUBLIC_URL" ]; then - echo 'Info: Setting PublicURL' - fi - - cat < application/config/config.php - array( - 'db' => array( - 'connectionString' => '$DB_TYPE:$DB_CONNECT=$DB_HOST;port=$DB_PORT;dbname=$DB_NAME;', - 'emulatePrepare' => true, - 'username' => '$DB_USERNAME', - 'password' => '$DB_PASSWORD', - 'charset' => '$DB_CHARSET', - 'tablePrefix' => '$DB_TABLE_PREFIX', - ), - 'urlManager' => array( - 'urlFormat' => '$URL_FORMAT', - 'rules' => array(), - 'showScriptName' => true, - ), - 'request' => array( - 'baseUrl' => '$BASE_URL', - ), - ), - 'config'=>array( - 'publicurl'=>'$PUBLIC_URL', - 'debug'=>$DEBUG, - 'debugsql'=>$DEBUG_SQL, - 'mysqlEngine' => '$DB_MYSQL_ENGINE', - ) -); - -EOF - -fi - -# Check if security config already provisioned -if [ -f application/config/security.php ]; then - echo 'Info: security.php already provisioned' -else - echo 'Info: Creating security.php' - if [ -n "$ENCRYPT_KEYPAIR" ]; then - - cat < application/config/security.php -&2 'Warning: No encryption keys were provided' - echo >&2 'Warning: A security.php config will be created by the application' - echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT' - fi -fi - -# Check if LimeSurvey database is provisioned -echo 'Info: Check if database already provisioned. Nevermind the Stack trace.' -php application/commands/console.php updatedb - -PHP_UPDATEDB_EXIT_CODE=$? - -if [ $PHP_UPDATEDB_EXIT_CODE -eq 0 ]; then - echo 'Info: Database already provisioned' -else - echo '' - echo 'Running console.php install' - php application/commands/console.php install "$ADMIN_USER" "$ADMIN_PASSWORD" "$ADMIN_NAME" "$ADMIN_EMAIL" -fi - -exec "$@" diff --git a/4.0/fpm-alpine/Dockerfile b/4.0/fpm-alpine/Dockerfile deleted file mode 100644 index cfce69c..0000000 --- a/4.0/fpm-alpine/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -FROM php:8.0-fpm-alpine -LABEL maintainer="markus@martialblog.de" -ARG version="4.6.3+210518" -ARG sha256_checksum="3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2" -ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" - -# Install OS dependencies -RUN set -ex; \ - apk add --no-cache --virtual .build-deps \ - freetype-dev \ - libpng-dev \ - libzip-dev \ - libjpeg-turbo-dev \ - tidyhtml-dev \ - libsodium-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=/usr/include/ --with-jpeg=/usr && \ - docker-php-ext-configure imap --with-imap-ssl && \ - docker-php-ext-install \ - exif \ - gd \ - imap \ - ldap \ - mbstring \ - pdo \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - sodium \ - tidy \ - zip - -# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) -RUN set -ex; \ - curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ - echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ - \ - tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \ - \ - rm -rf "/tmp/limesurvey.tar.gz" \ - /var/www/html/docs \ - /var/www/html/tests \ - /var/www/html/*.md && \ - chown -R www-data:root /var/www/ ; \ - chmod -R g=u /var/www - -EXPOSE 9000 - -WORKDIR /var/www/html -COPY entrypoint.sh entrypoint.sh -ENTRYPOINT ["/var/www/html/entrypoint.sh"] -CMD ["php-fpm"] diff --git a/4.0/fpm-alpine/entrypoint.sh b/4.0/fpm-alpine/entrypoint.sh deleted file mode 100755 index a75f5e9..0000000 --- a/4.0/fpm-alpine/entrypoint.sh +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash -# Entrypoint for Docker Container - - -DB_TYPE=${DB_TYPE:-'mysql'} -DB_HOST=${DB_HOST:-'mysql'} -DB_PORT=${DB_PORT:-'3306'} -DB_SOCK=${DB_SOCK:-} -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:-} -ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-} - -ADMIN_USER=${ADMIN_USER:-'admin'} -ADMIN_NAME=${ADMIN_NAME:-'admin'} -ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} -ADMIN_PASSWORD=${ADMIN_PASSWORD:-} - -BASE_URL=${BASE_URL:-} -PUBLIC_URL=${PUBLIC_URL:-} -URL_FORMAT=${URL_FORMAT:-'path'} - -DEBUG=${DEBUG:-0} -DEBUG_SQL=${DEBUG_SQL:-0} - -if [ -z "$DB_PASSWORD" ]; then - echo >&2 'Error: Missing DB_PASSWORD' - exit 1 -fi - -if [ -z "$ADMIN_PASSWORD" ]; then - echo >&2 'Error: Missing ADMIN_PASSWORD' - exit 1 -fi - -# Check if database is available -if [ -z "$DB_SOCK" ]; then - until nc -z -v -w30 "$DB_HOST" "$DB_PORT" - do - echo "Info: Waiting for database connection..." - sleep 5 - done -fi - -# Check if config already provisioned -if [ -f application/config/config.php ]; then - echo 'Info: config.php already provisioned' -else - echo 'Info: Generating config.php' - - if [ "$DB_TYPE" = 'mysql' ]; then - echo 'Info: Using MySQL configuration' - DB_CHARSET=${DB_CHARSET:-'utf8mb4'} - fi - - if [ "$DB_TYPE" = 'pgsql' ]; then - echo 'Info: Using PostgreSQL configuration' - DB_CHARSET=${DB_CHARSET:-'utf8'} - fi - - if [ -n "$DB_SOCK" ]; then - echo 'Info: Using unix socket' - DB_CONNECT='unix_socket' - else - echo 'Info: Using TCP connection' - DB_CONNECT='host' - fi - - if [ -z "$PUBLIC_URL" ]; then - echo 'Info: Setting PublicURL' - fi - - cat < application/config/config.php - array( - 'db' => array( - 'connectionString' => '$DB_TYPE:$DB_CONNECT=$DB_HOST;port=$DB_PORT;dbname=$DB_NAME;', - 'emulatePrepare' => true, - 'username' => '$DB_USERNAME', - 'password' => '$DB_PASSWORD', - 'charset' => '$DB_CHARSET', - 'tablePrefix' => '$DB_TABLE_PREFIX', - ), - 'urlManager' => array( - 'urlFormat' => '$URL_FORMAT', - 'rules' => array(), - 'showScriptName' => true, - ), - 'request' => array( - 'baseUrl' => '$BASE_URL', - ), - ), - 'config'=>array( - 'publicurl'=>'$PUBLIC_URL', - 'debug'=>$DEBUG, - 'debugsql'=>$DEBUG_SQL, - 'mysqlEngine' => '$DB_MYSQL_ENGINE', - ) -); - -EOF - -fi - -# Check if security config already provisioned -if [ -f application/config/security.php ]; then - echo 'Info: security.php already provisioned' -else - echo 'Info: Creating security.php' - if [ -n "$ENCRYPT_KEYPAIR" ]; then - - cat < application/config/security.php -&2 'Warning: No encryption keys were provided' - echo >&2 'Warning: A security.php config will be created by the application' - echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT' - fi -fi - -# Check if LimeSurvey database is provisioned -echo 'Info: Check if database already provisioned. Nevermind the Stack trace.' -php application/commands/console.php updatedb - -PHP_UPDATEDB_EXIT_CODE=$? - -if [ $PHP_UPDATEDB_EXIT_CODE -eq 0 ]; then - echo 'Info: Database already provisioned' -else - echo '' - echo 'Running console.php install' - php application/commands/console.php install "$ADMIN_USER" "$ADMIN_PASSWORD" "$ADMIN_NAME" "$ADMIN_EMAIL" -fi - -exec "$@" diff --git a/4.0/fpm/Dockerfile b/4.0/fpm/Dockerfile deleted file mode 100644 index d391808..0000000 --- a/4.0/fpm/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM php:8.0-fpm -LABEL maintainer="markus@martialblog.de" -ARG version="4.6.3+210518" -ARG sha256_checksum="3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2" -ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" - -# Install OS dependencies -RUN set -ex; \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install --no-install-recommends -y \ - \ - libldap2-dev \ - libfreetype6-dev \ - libjpeg-dev \ - libonig-dev \ - zlib1g-dev \ - libc-client-dev \ - libkrb5-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libtidy-dev \ - libsodium-dev \ - netcat \ - \ - && apt-get -y autoclean; apt-get -y autoremove; \ - rm -rf /var/lib/apt/lists/* - -# Link LDAP library for PHP ldap extension -RUN set -ex; \ - ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/ - -# Install PHP Plugins and Configure PHP imap plugin -RUN set -ex; \ - docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ - docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ - docker-php-ext-install -j5 \ - exif \ - gd \ - imap \ - ldap \ - mbstring \ - pdo \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - sodium \ - tidy \ - zip - -ENV LIMESURVEY_VERSION=$version - -# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) -RUN set -ex; \ - curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ - echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ - \ - tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \ - rm -f "/tmp/limesurvey.tar.gz" && \ - chown -R www-data:www-data /var/www/html - -EXPOSE 9000 - -WORKDIR /var/www/html -COPY entrypoint.sh entrypoint.sh -ENTRYPOINT ["/var/www/html/entrypoint.sh"] -CMD ["php-fpm"] diff --git a/4.0/fpm/entrypoint.sh b/4.0/fpm/entrypoint.sh deleted file mode 100755 index a75f5e9..0000000 --- a/4.0/fpm/entrypoint.sh +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash -# Entrypoint for Docker Container - - -DB_TYPE=${DB_TYPE:-'mysql'} -DB_HOST=${DB_HOST:-'mysql'} -DB_PORT=${DB_PORT:-'3306'} -DB_SOCK=${DB_SOCK:-} -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:-} -ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-} - -ADMIN_USER=${ADMIN_USER:-'admin'} -ADMIN_NAME=${ADMIN_NAME:-'admin'} -ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} -ADMIN_PASSWORD=${ADMIN_PASSWORD:-} - -BASE_URL=${BASE_URL:-} -PUBLIC_URL=${PUBLIC_URL:-} -URL_FORMAT=${URL_FORMAT:-'path'} - -DEBUG=${DEBUG:-0} -DEBUG_SQL=${DEBUG_SQL:-0} - -if [ -z "$DB_PASSWORD" ]; then - echo >&2 'Error: Missing DB_PASSWORD' - exit 1 -fi - -if [ -z "$ADMIN_PASSWORD" ]; then - echo >&2 'Error: Missing ADMIN_PASSWORD' - exit 1 -fi - -# Check if database is available -if [ -z "$DB_SOCK" ]; then - until nc -z -v -w30 "$DB_HOST" "$DB_PORT" - do - echo "Info: Waiting for database connection..." - sleep 5 - done -fi - -# Check if config already provisioned -if [ -f application/config/config.php ]; then - echo 'Info: config.php already provisioned' -else - echo 'Info: Generating config.php' - - if [ "$DB_TYPE" = 'mysql' ]; then - echo 'Info: Using MySQL configuration' - DB_CHARSET=${DB_CHARSET:-'utf8mb4'} - fi - - if [ "$DB_TYPE" = 'pgsql' ]; then - echo 'Info: Using PostgreSQL configuration' - DB_CHARSET=${DB_CHARSET:-'utf8'} - fi - - if [ -n "$DB_SOCK" ]; then - echo 'Info: Using unix socket' - DB_CONNECT='unix_socket' - else - echo 'Info: Using TCP connection' - DB_CONNECT='host' - fi - - if [ -z "$PUBLIC_URL" ]; then - echo 'Info: Setting PublicURL' - fi - - cat < application/config/config.php - array( - 'db' => array( - 'connectionString' => '$DB_TYPE:$DB_CONNECT=$DB_HOST;port=$DB_PORT;dbname=$DB_NAME;', - 'emulatePrepare' => true, - 'username' => '$DB_USERNAME', - 'password' => '$DB_PASSWORD', - 'charset' => '$DB_CHARSET', - 'tablePrefix' => '$DB_TABLE_PREFIX', - ), - 'urlManager' => array( - 'urlFormat' => '$URL_FORMAT', - 'rules' => array(), - 'showScriptName' => true, - ), - 'request' => array( - 'baseUrl' => '$BASE_URL', - ), - ), - 'config'=>array( - 'publicurl'=>'$PUBLIC_URL', - 'debug'=>$DEBUG, - 'debugsql'=>$DEBUG_SQL, - 'mysqlEngine' => '$DB_MYSQL_ENGINE', - ) -); - -EOF - -fi - -# Check if security config already provisioned -if [ -f application/config/security.php ]; then - echo 'Info: security.php already provisioned' -else - echo 'Info: Creating security.php' - if [ -n "$ENCRYPT_KEYPAIR" ]; then - - cat < application/config/security.php -&2 'Warning: No encryption keys were provided' - echo >&2 'Warning: A security.php config will be created by the application' - echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT' - fi -fi - -# Check if LimeSurvey database is provisioned -echo 'Info: Check if database already provisioned. Nevermind the Stack trace.' -php application/commands/console.php updatedb - -PHP_UPDATEDB_EXIT_CODE=$? - -if [ $PHP_UPDATEDB_EXIT_CODE -eq 0 ]; then - echo 'Info: Database already provisioned' -else - echo '' - echo 'Running console.php install' - php application/commands/console.php install "$ADMIN_USER" "$ADMIN_PASSWORD" "$ADMIN_NAME" "$ADMIN_EMAIL" -fi - -exec "$@" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d706b34..f389273 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,19 +12,19 @@ To update the version, simply update ARG variables for version and corresponding # Version from GitHub Tags # sha256 of tar.gz from GitHub Releases -$ grep ARG 4.0/apache/Dockerfile -ARG version='4.3.13+200824' +$ grep ARG 5.0/apache/Dockerfile +ARG version='5.3.13+200824' ARG sha256_checksum='4e9c6f20e' ``` It is best to use the upgrade shell script: ```bash -./upgrade.sh 4.3.13+200824 +./upgrade.sh 5.3.13+200824 # Check if sha256 is correct -git add 4.0/ && git commit -m 'Upgrading to Version 4.3.13+200824' -git tag 4.3.13-200824 +git add 5.0/ && git commit -m 'Upgrading to Version 5.3.13+200824' +git tag 5.3.13-200824 ``` ## Testing