From 238546fcafeb11f59f8d21082245ab1075672919 Mon Sep 17 00:00:00 2001 From: selim13 Date: Thu, 2 Jul 2020 20:20:34 +0300 Subject: [PATCH] Bump master to 3.3.0 --- 3.1-apache/Dockerfile | 78 --------- 3.1-apache/php5/conf.d/opcache.ini | 7 - 3.1-apache/start.sh | 27 --- 3.2-apache/apache2/conf.d/mpm.conf | 9 - 3.2-apache/apache2/httpd.conf | 155 ------------------ 3.2-apache/php/php-cli.ini | 2 - 3.2-apache/php/php.ini | 18 -- 3.2-apache/phpbb/config.php | 25 --- 3.2-apache/Dockerfile => Dockerfile | 10 +- README.MD | 3 +- .../apache2 => apache2}/conf.d/mpm.conf | 0 {3.1-apache/apache2 => apache2}/httpd.conf | 0 docker-compose.build-test.yml | 2 +- docker-compose.yml | 2 +- {3.2-apache/php => php}/conf.d/opcache.ini | 0 {3.1-apache/php5 => php}/php-cli.ini | 0 {3.1-apache/php5 => php}/php.ini | 0 {3.1-apache/phpbb => phpbb}/config.php | 0 3.2-apache/start.sh => start.sh | 0 19 files changed, 9 insertions(+), 329 deletions(-) delete mode 100644 3.1-apache/Dockerfile delete mode 100644 3.1-apache/php5/conf.d/opcache.ini delete mode 100755 3.1-apache/start.sh delete mode 100644 3.2-apache/apache2/conf.d/mpm.conf delete mode 100644 3.2-apache/apache2/httpd.conf delete mode 100644 3.2-apache/php/php-cli.ini delete mode 100644 3.2-apache/php/php.ini delete mode 100644 3.2-apache/phpbb/config.php rename 3.2-apache/Dockerfile => Dockerfile (86%) rename {3.1-apache/apache2 => apache2}/conf.d/mpm.conf (100%) rename {3.1-apache/apache2 => apache2}/httpd.conf (100%) rename {3.2-apache/php => php}/conf.d/opcache.ini (100%) rename {3.1-apache/php5 => php}/php-cli.ini (100%) rename {3.1-apache/php5 => php}/php.ini (100%) rename {3.1-apache/phpbb => phpbb}/config.php (100%) rename 3.2-apache/start.sh => start.sh (100%) diff --git a/3.1-apache/Dockerfile b/3.1-apache/Dockerfile deleted file mode 100644 index 4b99345..0000000 --- a/3.1-apache/Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -FROM alpine:3.8 - -MAINTAINER Dmitry Seleznyov - -RUN apk add --no-cache curl \ - imagemagick \ - apache2 \ - php5-apache2 \ - php5-cli \ - php5-ctype \ - php5-opcache \ - php5-curl \ - php5-openssl \ - php5-ftp \ - php5-mysqli \ - php5-sqlite3 \ - php5-pgsql \ - php5-json \ - php5-xml \ - php5-zlib \ - php5-zip \ - php5-gd \ - su-exec - -### phpBB -ENV PHPBB_VERSION 3.1.12 -ENV PHPBB_SHA256 '14476397931bc73642a2144430b7ed45db75bcd51369b0115ca34c755602fb65' - -WORKDIR /tmp - -RUN curl -SL https://download.phpbb.com/pub/release/3.1/${PHPBB_VERSION}/phpBB-${PHPBB_VERSION}.tar.bz2 -o phpbb.tar.bz2 \ - && echo "${PHPBB_SHA256} phpbb.tar.bz2" | sha256sum -c - \ - && tar -xjf phpbb.tar.bz2 \ - && mkdir /phpbb \ - && mkdir /phpbb/sqlite \ - && mv phpBB3 /phpbb/www \ - && rm -f phpbb.tar.bz2 - -COPY phpbb/config.php /phpbb/www - -### Server -RUN mkdir -p /run/apache2 \ - && chown apache:apache /run/apache2 - -COPY apache2/httpd.conf /etc/apache2/ -COPY apache2/conf.d/* /etc/apache2/conf.d/ - -COPY php5/php.ini /etc/php5/ -COPY php5/php-cli.ini /etc/php5/ -COPY php5/conf.d/* /etc/php5/conf.d/ -# Alpine 3.6 doesn't create this symlink for PHP5 in favour of PHP7 -RUN ln -s /usr/bin/php5 /usr/bin/php - -COPY start.sh /usr/local/bin/ - -RUN chown -R apache:apache /phpbb -WORKDIR /phpbb/www - -#VOLUME /phpbb/sqlite -#VOLUME /phpbb/www/files -#VOLUME /phpbb/www/store -#VOLUME /phpbb/www/images/avatars/upload - -ENV PHPBB_INSTALL= \ - PHPBB_DB_DRIVER=sqlite3 \ - PHPBB_DB_HOST=/phpbb/sqlite/sqlite.db \ - PHPBB_DB_PORT= \ - PHPBB_DB_NAME= \ - PHPBB_DB_USER= \ - PHPBB_DB_PASSWD= \ - PHPBB_DB_TABLE_PREFIX=phpbb_ \ - PHPBB_DB_AUTOMIGRATE= \ - PHPBB_DISPLAY_LOAD_TIME= \ - PHPBB_DEBUG= \ - PHPBB_DEBUG_CONTAINER= - -EXPOSE 80 -CMD ["start.sh"] \ No newline at end of file diff --git a/3.1-apache/php5/conf.d/opcache.ini b/3.1-apache/php5/conf.d/opcache.ini deleted file mode 100644 index e11cabc..0000000 --- a/3.1-apache/php5/conf.d/opcache.ini +++ /dev/null @@ -1,7 +0,0 @@ -opcache.memory_consumption=64 -opcache.interned_strings_buffer=8 -opcache.max_accelerated_files=4000 -opcache.validate_timestamps=0 -opcache.revalidate_freq=0 -opcache.fast_shutdown=1 -opcache.enable_cli=1 diff --git a/3.1-apache/start.sh b/3.1-apache/start.sh deleted file mode 100755 index 2203168..0000000 --- a/3.1-apache/start.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -set -e - -[[ "${PHPBB_INSTALL}" = "true" ]] && echo "" > config.php -[[ "${PHPBB_INSTALL}" != "true" ]] && rm -rf install - -db_wait() { - if [[ "${PHPBB_DB_WAIT}" = "true" && "${PHPBB_DB_DRIVER}" != "sqlite3" && "${PHPBB_DB_DRIVER}" != "sqlite" ]]; then - until nc -z ${PHPBB_DB_HOST} ${PHPBB_DB_PORT}; do - echo "$(date) - waiting for database on ${PHPBB_DB_HOST}:${PHPBB_DB_PORT} to start before applying migrations" - sleep 3 - done - fi -} - -db_migrate() { - if [[ "${PHPBB_DB_AUTOMIGRATE}" = "true" && "${PHPBB_INSTALL}" != "true" ]]; then - echo "$(date) - applying migrations" - su-exec apache php bin/phpbbcli.php db:migrate - fi -} - -# Apache gets grumpy about PID files pre-existing -rm -f /run/apache2/httpd.pid - -db_wait && db_migrate && exec httpd -DFOREGROUND "$@" diff --git a/3.2-apache/apache2/conf.d/mpm.conf b/3.2-apache/apache2/conf.d/mpm.conf deleted file mode 100644 index d96dfb1..0000000 --- a/3.2-apache/apache2/conf.d/mpm.conf +++ /dev/null @@ -1,9 +0,0 @@ -PidFile "/run/apache2/httpd.pid" - - - StartServers 5 - MinSpareServers 5 - MaxSpareServers 10 - MaxRequestWorkers 250 - MaxConnectionsPerChild 0 - \ No newline at end of file diff --git a/3.2-apache/apache2/httpd.conf b/3.2-apache/apache2/httpd.conf deleted file mode 100644 index 862a9b5..0000000 --- a/3.2-apache/apache2/httpd.conf +++ /dev/null @@ -1,155 +0,0 @@ -ServerTokens Prod - -ServerRoot /var/www - -Listen 80 - -LoadModule authn_file_module modules/mod_authn_file.so -#LoadModule authn_dbm_module modules/mod_authn_dbm.so -#LoadModule authn_anon_module modules/mod_authn_anon.so -#LoadModule authn_dbd_module modules/mod_authn_dbd.so -#LoadModule authn_socache_module modules/mod_authn_socache.so -LoadModule authn_core_module modules/mod_authn_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule authz_groupfile_module modules/mod_authz_groupfile.so -LoadModule authz_user_module modules/mod_authz_user.so -#LoadModule authz_dbm_module modules/mod_authz_dbm.so -#LoadModule authz_owner_module modules/mod_authz_owner.so -#LoadModule authz_dbd_module modules/mod_authz_dbd.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule access_compat_module modules/mod_access_compat.so -LoadModule auth_basic_module modules/mod_auth_basic.so -#LoadModule auth_form_module modules/mod_auth_form.so -#LoadModule auth_digest_module modules/mod_auth_digest.so -#LoadModule allowmethods_module modules/mod_allowmethods.so -#LoadModule file_cache_module modules/mod_file_cache.so -#LoadModule cache_module modules/mod_cache.so -#LoadModule cache_disk_module modules/mod_cache_disk.so -#LoadModule cache_socache_module modules/mod_cache_socache.so -#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so -#LoadModule socache_dbm_module modules/mod_socache_dbm.so -#LoadModule socache_memcache_module modules/mod_socache_memcache.so -#LoadModule watchdog_module modules/mod_watchdog.so -#LoadModule macro_module modules/mod_macro.so -#LoadModule dbd_module modules/mod_dbd.so -#LoadModule dumpio_module modules/mod_dumpio.so -#LoadModule echo_module modules/mod_echo.so -#LoadModule buffer_module modules/mod_buffer.so -#LoadModule data_module modules/mod_data.so -#LoadModule ratelimit_module modules/mod_ratelimit.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -#LoadModule ext_filter_module modules/mod_ext_filter.so -#LoadModule request_module modules/mod_request.so -#LoadModule include_module modules/mod_include.so -LoadModule filter_module modules/mod_filter.so -#LoadModule reflector_module modules/mod_reflector.so -#LoadModule substitute_module modules/mod_substitute.so -#LoadModule sed_module modules/mod_sed.so -#LoadModule charset_lite_module modules/mod_charset_lite.so -#LoadModule deflate_module modules/mod_deflate.so -LoadModule mime_module modules/mod_mime.so -LoadModule log_config_module modules/mod_log_config.so -#LoadModule log_debug_module modules/mod_log_debug.so -#LoadModule log_forensic_module modules/mod_log_forensic.so -#LoadModule logio_module modules/mod_logio.so -LoadModule env_module modules/mod_env.so -#LoadModule mime_magic_module modules/mod_mime_magic.so -#LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -#LoadModule usertrack_module modules/mod_usertrack.so -#LoadModule unique_id_module modules/mod_unique_id.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule version_module modules/mod_version.so -#LoadModule remoteip_module modules/mod_remoteip.so -#LoadModule session_module modules/mod_session.so -#LoadModule session_cookie_module modules/mod_session_cookie.so -#LoadModule session_dbd_module modules/mod_session_dbd.so -#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so -#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so -#LoadModule dialup_module modules/mod_dialup.so -#LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule mpm_prefork_module modules/mod_mpm_prefork.so -#LoadModule mpm_worker_module modules/mod_mpm_worker.so -LoadModule unixd_module modules/mod_unixd.so -#LoadModule heartbeat_module modules/mod_heartbeat.so -#LoadModule heartmonitor_module modules/mod_heartmonitor.so -LoadModule status_module modules/mod_status.so -#LoadModule autoindex_module modules/mod_autoindex.so -#LoadModule asis_module modules/mod_asis.so -#LoadModule info_module modules/mod_info.so -#LoadModule suexec_module modules/mod_suexec.so - - #LoadModule cgid_module modules/mod_cgid.so - - - #LoadModule cgi_module modules/mod_cgi.so - -#LoadModule vhost_alias_module modules/mod_vhost_alias.so -#LoadModule negotiation_module modules/mod_negotiation.so -LoadModule dir_module modules/mod_dir.so -#LoadModule actions_module modules/mod_actions.so -#LoadModule speling_module modules/mod_speling.so -#LoadModule userdir_module modules/mod_userdir.so -LoadModule alias_module modules/mod_alias.so -LoadModule rewrite_module modules/mod_rewrite.so - -LoadModule negotiation_module modules/mod_negotiation.so - - - User apache - Group apache - - - -ServerAdmin you@example.com - -ServerSignature Off - -#ServerName www.example.com:80 - - - AllowOverride none - Require all denied - - -DocumentRoot "/phpbb/www" - - Options FollowSymLinks - AllowOverride All - Require all granted - - # Return 404 for all dot files (.htaccess, .git, etc...) - RedirectMatch 404 /\..*$ - - - - DirectoryIndex index.php index.html - - - - Require all denied - - -ErrorLog /dev/stderr -LogLevel warn - - - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined - LogFormat "%h %l %u %t \"%r\" %>s %b" common - - CustomLog /dev/stdout combined - - - - - TypesConfig /etc/apache2/mime.types - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - - - - MIMEMagicFile /etc/apache2/magic - - -IncludeOptional /etc/apache2/conf.d/*.conf diff --git a/3.2-apache/php/php-cli.ini b/3.2-apache/php/php-cli.ini deleted file mode 100644 index 2d0627a..0000000 --- a/3.2-apache/php/php-cli.ini +++ /dev/null @@ -1,2 +0,0 @@ -[php] -memory_limit = -1 diff --git a/3.2-apache/php/php.ini b/3.2-apache/php/php.ini deleted file mode 100644 index 89b7bb0..0000000 --- a/3.2-apache/php/php.ini +++ /dev/null @@ -1,18 +0,0 @@ -[PHP] -file_uploads = On -max_file_uploads = 2 -upload_max_filesize = 8M -post_max_size = 8M - -allow_url_fopen = On - -expose_php = Off -security.limit_extensions = .php - -output_buffering = On -display_errors = Off -log_errors = On -error_log = /dev/stderr - -[Date] -date.timezone = 'UTC' \ No newline at end of file diff --git a/3.2-apache/phpbb/config.php b/3.2-apache/phpbb/config.php deleted file mode 100644 index 2d40245..0000000 --- a/3.2-apache/phpbb/config.php +++ /dev/null @@ -1,25 +0,0 @@ - +LABEL maintainer="selim013@gmail.com" RUN apk add --no-cache curl \ imagemagick \ @@ -26,12 +26,12 @@ RUN apk add --no-cache curl \ su-exec ### phpBB -ENV PHPBB_VERSION 3.2.9 -ENV PHPBB_SHA256 '4faf0f469d5ad5fe56c4ac44aa8cf9166c9381f225267a428f45462d1417a0ca' +ENV PHPBB_VERSION 3.3.0 +ENV PHPBB_SHA256 'a6234ac9dcf9086c025ece29a0a235f997a92bb9a994eff0ddcf8917e841262f' WORKDIR /tmp -RUN curl -SL https://download.phpbb.com/pub/release/3.2/${PHPBB_VERSION}/phpBB-${PHPBB_VERSION}.tar.bz2 -o phpbb.tar.bz2 \ +RUN curl -SL https://download.phpbb.com/pub/release/3.3/${PHPBB_VERSION}/phpBB-${PHPBB_VERSION}.tar.bz2 -o phpbb.tar.bz2 \ && echo "${PHPBB_SHA256} phpbb.tar.bz2" | sha256sum -c - \ && tar -xjf phpbb.tar.bz2 \ && mkdir /phpbb \ diff --git a/README.MD b/README.MD index fec3805..0aff55e 100644 --- a/README.MD +++ b/README.MD @@ -1,6 +1,7 @@ # Supported tags and respective `Dockerfile` links -- [`3.2-apache`, `3-apache`, `3.2`, `3`, `apache`, `latest` (*3.2-apache/Dockerfile*)](https://github.com/selim13/docker-phpbb/blob/master/3.2-apache/Dockerfile) +- [`3.3.0`, `latest`](https://github.com/selim13/docker-phpbb/blob/master/Dockerfile) +- [`3.2-apache`, `3-apache`, `3.2`, `3`, `apache` (*3.2-apache/Dockerfile*)](https://github.com/selim13/docker-phpbb/blob/master/3.2-apache/Dockerfile) - [`3.1-apache`, `3.1` (*3.1-apache/Dockerfile*)](https://github.com/selim13/docker-phpbb/blob/master/3.1-apache/Dockerfile) # phpBB3 diff --git a/3.1-apache/apache2/conf.d/mpm.conf b/apache2/conf.d/mpm.conf similarity index 100% rename from 3.1-apache/apache2/conf.d/mpm.conf rename to apache2/conf.d/mpm.conf diff --git a/3.1-apache/apache2/httpd.conf b/apache2/httpd.conf similarity index 100% rename from 3.1-apache/apache2/httpd.conf rename to apache2/httpd.conf diff --git a/docker-compose.build-test.yml b/docker-compose.build-test.yml index dab40f7..839387a 100644 --- a/docker-compose.build-test.yml +++ b/docker-compose.build-test.yml @@ -2,7 +2,7 @@ version: '2' services: phpbb: - build: './3.2-apache' + build: . ports: - '127.0.0.1:8000:80' volumes: diff --git a/docker-compose.yml b/docker-compose.yml index b1bb1f5..cbe82d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ volumes: services: phpbb: - image: selim13/phpbb:3.2-apache + image: selim13/phpbb:3.3 ports: - '127.0.0.1:8000:80' volumes: diff --git a/3.2-apache/php/conf.d/opcache.ini b/php/conf.d/opcache.ini similarity index 100% rename from 3.2-apache/php/conf.d/opcache.ini rename to php/conf.d/opcache.ini diff --git a/3.1-apache/php5/php-cli.ini b/php/php-cli.ini similarity index 100% rename from 3.1-apache/php5/php-cli.ini rename to php/php-cli.ini diff --git a/3.1-apache/php5/php.ini b/php/php.ini similarity index 100% rename from 3.1-apache/php5/php.ini rename to php/php.ini diff --git a/3.1-apache/phpbb/config.php b/phpbb/config.php similarity index 100% rename from 3.1-apache/phpbb/config.php rename to phpbb/config.php diff --git a/3.2-apache/start.sh b/start.sh similarity index 100% rename from 3.2-apache/start.sh rename to start.sh