-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix small bug in run.sh + drop support for php < 7.2 + update CHANGEL…
…OG (#167) * fix small bug in run.sh + drop support for php < 7.2 + update CHANGELOG * move images into separate directories now that configurations have diverged * accidentally committed package.json version update
- Loading branch information
Showing
7 changed files
with
231 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| ARG PHP_VERSION=7.3 | ||
| FROM php:${PHP_VERSION}-apache | ||
| FROM php:7.2-apache | ||
| ARG VERSION=latest | ||
| LABEL maintainer="Derek P Sifford <[email protected]>" \ | ||
| version="${VERSION}-php${PHP_VERSION}" | ||
| version="${VERSION}-php7.2" | ||
|
|
||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| FROM php:7.3-apache | ||
| ARG VERSION=latest | ||
| LABEL maintainer="Derek P Sifford <[email protected]>" \ | ||
| version="${VERSION}-php7.3" | ||
|
|
||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
|
|
||
| # Install base requirements & sensible defaults + required PHP extensions | ||
| # hadolint ignore=DL3008 | ||
| RUN echo "deb http://ftp.debian.org/debian $(sed -n 's/^VERSION=.*(\(.*\)).*/\1/p' /etc/os-release)-backports main" >> /etc/apt/sources.list \ | ||
| && apt-get update \ | ||
| && apt-get install -y --no-install-recommends \ | ||
| bash-completion \ | ||
| bindfs \ | ||
| ghostscript \ | ||
| less \ | ||
| libjpeg-dev \ | ||
| libmagickwand-dev \ | ||
| libpng-dev \ | ||
| libxml2-dev \ | ||
| libzip-dev \ | ||
| mariadb-client \ | ||
| sudo \ | ||
| unzip \ | ||
| vim \ | ||
| zip \ | ||
| && apt-get -t "$(sed -n 's/^VERSION=.*(\(.*\)).*/\1/p' /etc/os-release)-backports" install -y --no-install-recommends \ | ||
| python-certbot-apache \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ | ||
| && docker-php-ext-configure zip --with-libzip \ | ||
| && pecl install imagick \ | ||
| && pecl install redis \ | ||
| && docker-php-ext-install \ | ||
| bcmath \ | ||
| exif \ | ||
| gd \ | ||
| mysqli \ | ||
| opcache \ | ||
| soap \ | ||
| zip \ | ||
| && docker-php-ext-enable imagick \ | ||
| && docker-php-ext-enable redis \ | ||
| && { \ | ||
| echo 'memory_limit = 512M'; \ | ||
| # See https://github.com/visiblevc/wordpress-starter/issues/160#issuecomment-544561961 | ||
| echo 'upload_max_filesize = 50M'; \ | ||
| } > /usr/local/etc/php/php.ini \ | ||
| # See https://secure.php.net/manual/en/opcache.installation.php | ||
| && { \ | ||
| echo 'opcache.memory_consumption = 128'; \ | ||
| echo 'opcache.interned_strings_buffer = 8'; \ | ||
| echo 'opcache.max_accelerated_files = 4000'; \ | ||
| echo 'opcache.revalidate_freq = 2'; \ | ||
| echo 'opcache.fast_shutdown = 1'; \ | ||
| echo 'opcache.enable_cli = 1'; \ | ||
| } > /usr/local/etc/php/conf.d/opcache-recommended.ini \ | ||
| && sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf \ | ||
| # Fixes issue where error is logged stating apache could not resolve the | ||
| # fully qualified domain name | ||
| && echo 'ServerName localhost' > /etc/apache2/conf-available/fqdn.conf \ | ||
| # Grab and install wp-cli from remote | ||
| && curl --create-dirs \ | ||
| -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ | ||
| -o /etc/bash_completion.d/wp-cli https://raw.githubusercontent.com/wp-cli/wp-cli/master/utils/wp-completion.bash \ | ||
| && a2enconf fqdn \ | ||
| && a2enmod rewrite expires | ||
|
|
||
| # Add admin superuser, create install directory, adjust perms, & add symlink | ||
| COPY run.sh /run.sh | ||
| RUN useradd -ms /bin/bash -G sudo admin \ | ||
| && echo "admin ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/admin \ | ||
| && chmod 0440 /etc/sudoers.d/admin \ | ||
| && chmod +x /usr/local/bin/wp /run.sh \ | ||
| && mkdir -m 0700 /app \ | ||
| && chown admin:admin /app \ | ||
| && printf '%s\t%s\t%s\t%s%s%s%s%s%s%s%s\t%d\t%d\n' \ | ||
| '/app' \ | ||
| '/var/www/html' \ | ||
| 'fuse.bindfs' \ | ||
| 'force-user=www-data,' \ | ||
| 'force-group=www-data,' \ | ||
| 'create-for-user=admin,' \ | ||
| 'create-for-group=admin,' \ | ||
| 'create-with-perms=0644:a+X,' \ | ||
| 'chgrp-ignore,' \ | ||
| 'chown-ignore,' \ | ||
| 'chmod-ignore' \ | ||
| 0 \ | ||
| 0 > /etc/fstab | ||
|
|
||
| USER admin | ||
| WORKDIR /app | ||
| EXPOSE 80 443 | ||
| CMD ["/run.sh"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| FROM php:7.4-apache | ||
| ARG VERSION=latest | ||
| LABEL maintainer="Derek P Sifford <[email protected]>" \ | ||
| version="${VERSION}-php7.4" | ||
|
|
||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
|
|
||
| # Install base requirements & sensible defaults + required PHP extensions | ||
| # hadolint ignore=DL3008 | ||
| RUN echo "deb http://ftp.debian.org/debian $(sed -n 's/^VERSION=.*(\(.*\)).*/\1/p' /etc/os-release)-backports main" >> /etc/apt/sources.list \ | ||
| && apt-get update \ | ||
| && apt-get install -y --no-install-recommends \ | ||
| bash-completion \ | ||
| bindfs \ | ||
| ghostscript \ | ||
| less \ | ||
| libjpeg-dev \ | ||
| libmagickwand-dev \ | ||
| libpng-dev \ | ||
| libxml2-dev \ | ||
| libzip-dev \ | ||
| mariadb-client \ | ||
| sudo \ | ||
| unzip \ | ||
| vim \ | ||
| zip \ | ||
| && apt-get -t "$(sed -n 's/^VERSION=.*(\(.*\)).*/\1/p' /etc/os-release)-backports" install -y --no-install-recommends \ | ||
| python-certbot-apache \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| && docker-php-ext-configure gd --with-freetype --with-jpeg \ | ||
| && pecl install imagick \ | ||
| && pecl install redis \ | ||
| && docker-php-ext-install \ | ||
| bcmath \ | ||
| exif \ | ||
| gd \ | ||
| mysqli \ | ||
| opcache \ | ||
| soap \ | ||
| zip \ | ||
| && docker-php-ext-enable imagick \ | ||
| && docker-php-ext-enable redis \ | ||
| && { \ | ||
| echo 'memory_limit = 512M'; \ | ||
| # See https://github.com/visiblevc/wordpress-starter/issues/160#issuecomment-544561961 | ||
| echo 'upload_max_filesize = 50M'; \ | ||
| } > /usr/local/etc/php/php.ini \ | ||
| # See https://secure.php.net/manual/en/opcache.installation.php | ||
| && { \ | ||
| echo 'opcache.memory_consumption = 128'; \ | ||
| echo 'opcache.interned_strings_buffer = 8'; \ | ||
| echo 'opcache.max_accelerated_files = 4000'; \ | ||
| echo 'opcache.revalidate_freq = 2'; \ | ||
| echo 'opcache.fast_shutdown = 1'; \ | ||
| echo 'opcache.enable_cli = 1'; \ | ||
| } > /usr/local/etc/php/conf.d/opcache-recommended.ini \ | ||
| && sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf \ | ||
| # Fixes issue where error is logged stating apache could not resolve the | ||
| # fully qualified domain name | ||
| && echo 'ServerName localhost' > /etc/apache2/conf-available/fqdn.conf \ | ||
| # Grab and install wp-cli from remote | ||
| && curl --create-dirs \ | ||
| -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ | ||
| -o /etc/bash_completion.d/wp-cli https://raw.githubusercontent.com/wp-cli/wp-cli/master/utils/wp-completion.bash \ | ||
| && a2enconf fqdn \ | ||
| && a2enmod rewrite expires | ||
|
|
||
| # Add admin superuser, create install directory, adjust perms, & add symlink | ||
| COPY run.sh /run.sh | ||
| RUN useradd -ms /bin/bash -G sudo admin \ | ||
| && echo "admin ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/admin \ | ||
| && chmod 0440 /etc/sudoers.d/admin \ | ||
| && chmod +x /usr/local/bin/wp /run.sh \ | ||
| && mkdir -m 0700 /app \ | ||
| && chown admin:admin /app \ | ||
| && printf '%s\t%s\t%s\t%s%s%s%s%s%s%s%s\t%d\t%d\n' \ | ||
| '/app' \ | ||
| '/var/www/html' \ | ||
| 'fuse.bindfs' \ | ||
| 'force-user=www-data,' \ | ||
| 'force-group=www-data,' \ | ||
| 'create-for-user=admin,' \ | ||
| 'create-for-group=admin,' \ | ||
| 'create-with-perms=0644:a+X,' \ | ||
| 'chgrp-ignore,' \ | ||
| 'chown-ignore,' \ | ||
| 'chmod-ignore' \ | ||
| 0 \ | ||
| 0 > /etc/fstab | ||
|
|
||
| USER admin | ||
| WORKDIR /app | ||
| EXPOSE 80 443 | ||
| CMD ["/run.sh"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters