Skip to content
This repository was archived by the owner on Aug 17, 2023. It is now read-only.

Reduce number of layers #3

Open
madmath03 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reduce number of layers #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59e9a55
Reduce number of layers
madmath03 Apr 19, 2018
983e6f0
Minor typo in doc
madmath03 Apr 19, 2018
c13f14e
Remove duplicate memcache install
madmath03 Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ after_success:
- docker tag ${REPO}:${COMMIT}-cli ${REPO}:${CLI}
- docker tag ${REPO}:${COMMIT}-cli ${REPO}:travis-${TRAVIS_BUILD_NUMBER}-cli
# push to public registry
- docker push ${REPO}
- docker push ${REPO}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Set the following minimal configuration options:

## Updating

Because the `docker-compose` levegare persistent volume in the Wordpress root directory, its required to open a session in the `cli` container in order to run the command `wp core update`.
Because the `docker-compose` leverage persistent volume in the Wordpress root directory, its required to open a session in the `cli` container in order to run the command `wp core update`.

### Interactive

Expand Down
46 changes: 22 additions & 24 deletions cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,37 @@ RUN apt-get update && \
less \
mysql-client \
libjpeg-dev \
libpng-dev

RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr && \
docker-php-ext-install gd mysqli opcache

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
libpng-dev && \
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr && \
docker-php-ext-install gd mysqli opcache && \
# set recommended PHP.ini settings
# 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

# Install needed php extensions: ldap
#
RUN apt-get install libldap2-dev -y && \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini && \
# Install needed php extensions: ldap
#
apt-get install libldap2-dev -y && \
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
docker-php-ext-install ldap

RUN mkdir -p /var/www/html && \
chown -R www-data:www-data /var/www/html

RUN curl -L https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar \
docker-php-ext-install ldap && \
# Prepare folders
#
mkdir -p /var/www/html && \
chown -R www-data:www-data /var/www/html && \
# Install WP-CLI
#
curl -L https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar \
-o /usr/local/bin/wp-cli.phar && \
chmod +x /usr/local/bin/wp-cli.phar && \
ln -s /usr/local/bin/wp-cli.phar /bin/wp && \
wp --allow-root --version

# Cleanup
RUN rm -rf /var/lib/apt/lists/*
wp --allow-root --version && \
# Cleanup
rm -rf /var/lib/apt/lists/*

COPY docker-entrypoint.sh /docker-entrypoint.sh
RUN chmod +x /docker-entrypoint.sh
Expand All @@ -53,4 +51,4 @@ VOLUME /var/www/html
USER www-data

ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD ["wp", "shell"]
CMD ["wp", "shell"]
64 changes: 28 additions & 36 deletions php5-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,50 @@ FROM wordpress:4.9.4-php5.6-fpm

LABEL maintainer='Florian JUDITH <florian.judith.b@gmail.com>'

RUN apt-get update
RUN apt-get install --no-install-recommends -y tidy csstidy nano netcat

RUN mkdir -p /usr/src/php/ext

# Install needed php extensions: memcached
#
RUN apt-get install --no-install-recommends -y libmemcached-dev && \
RUN apt-get update && \
apt-get install --no-install-recommends -y tidy csstidy nano netcat && \
mkdir -p /usr/src/php/ext && \
# Install needed php extensions: memcached
#
apt-get install --no-install-recommends -y libmemcached-dev && \
curl -o memcached.tgz -SL http://pecl.php.net/get/memcached-2.2.0.tgz && \
tar -xf memcached.tgz -C /usr/src/php/ext/ && \
echo extension=memcached.so >> /usr/local/etc/php/conf.d/memcached.ini && \
rm memcached.tgz && \
mv /usr/src/php/ext/memcached-2.2.0 /usr/src/php/ext/memcached

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
mv /usr/src/php/ext/memcached-2.2.0 /usr/src/php/ext/memcached && \
# set recommended PHP.ini settings
# 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

# Install needed php extensions: memcache
#
RUN curl -o memcache.tgz -SL http://pecl.php.net/get/memcache-3.0.8.tgz && \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini && \
# Install needed php extensions: memcache
#
curl -o memcache.tgz -SL http://pecl.php.net/get/memcache-3.0.8.tgz && \
tar -xf memcache.tgz -C /usr/src/php/ext/ && \
rm memcache.tgz && \
mv /usr/src/php/ext/memcache-3.0.8 /usr/src/php/ext/memcache

RUN apt-get install -y --no-install-recommends libz-dev && \
mv /usr/src/php/ext/memcache-3.0.8 /usr/src/php/ext/memcache && \
apt-get install -y --no-install-recommends libz-dev && \
curl -o zip.tgz -SL http://pecl.php.net/get/zip-1.15.1.tgz && \
tar -xf zip.tgz -C /usr/src/php/ext/ && \
rm zip.tgz && \
mv /usr/src/php/ext/zip-1.15.1 /usr/src/php/ext/zip

RUN docker-php-ext-install memcached
RUN docker-php-ext-install memcache
RUN docker-php-ext-install zip

# Install needed php extensions: ldap
#
RUN apt-get install --no-install-recommends -y libldap2-dev && \
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
docker-php-ext-install ldap

# Cleanup
RUN rm -rf /var/lib/apt/lists/*
mv /usr/src/php/ext/zip-1.15.1 /usr/src/php/ext/zip && \
docker-php-ext-install memcached && \
docker-php-ext-install memcache && \
docker-php-ext-install zip && \
# Install needed php extensions: ldap
#
apt-get install --no-install-recommends -y libldap2-dev && \
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
docker-php-ext-install ldap && \
# Cleanup
rm -rf /var/lib/apt/lists/*


# ENTRYPOINT resets CMD
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["php-fpm"]
CMD ["php-fpm"]
105 changes: 45 additions & 60 deletions php7-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,88 +2,73 @@ FROM wordpress:4.9.4-php7.1-fpm

LABEL maintainer='Florian JUDITH <florian.judith.b@gmail.com>'

RUN apt-get update
RUN apt-get install --no-install-recommends -y tidy csstidy nano netcat

RUN mkdir -p /usr/src/php/ext

# Install needed php extensions: memcached
#
RUN apt-get install -y libpq-dev libmemcached-dev && \
RUN apt-get update && \
apt-get install --no-install-recommends -y tidy csstidy nano netcat && \
mkdir -p /usr/src/php/ext && \
# Install needed php extensions: memcached
#
apt-get install -y libpq-dev libmemcached-dev && \
curl -o memcached.tgz -SL http://pecl.php.net/get/memcached-3.0.3.tgz && \
tar -xf memcached.tgz -C /usr/src/php/ext/ && \
echo extension=memcached.so >> /usr/local/etc/php/conf.d/memcached.ini && \
rm memcached.tgz && \
mv /usr/src/php/ext/memcached-3.0.3 /usr/src/php/ext/memcached

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
mv /usr/src/php/ext/memcached-3.0.3 /usr/src/php/ext/memcached && \
# set recommended PHP.ini settings
# 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


# Install needed php extensions: memcache
#
RUN apt-get install --no-install-recommends -y unzip libssl-dev libpcre3 libpcre3-dev && \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini && \
# Install needed php extensions: memcache
#
apt-get install --no-install-recommends -y unzip libssl-dev libpcre3 libpcre3-dev && \
cd /usr/src/php/ext/ && \
curl -sSL -o php7.zip https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCKING_IO_php7.zip && \
unzip php7.zip && \
mv pecl-memcache-NON_BLOCKING_IO_php7 memcache && \
unzip php7.zip && \
mv pecl-memcache-NON_BLOCKING_IO_php7 memcache && \
docker-php-ext-configure memcache --with-php-config=/usr/local/bin/php-config && \
docker-php-ext-install memcache && \
docker-php-ext-install memcached && \
echo "extension=memcache.so" > /usr/local/etc/php/conf.d/ext-memcache.ini && \
rm -rf /tmp/pecl-memcache-php7 php7.zip


# Install needed php extensions: zip
#
RUN apt-get install -y libz-dev && \
rm -rf /tmp/pecl-memcache-php7 php7.zip && \
# Install needed php extensions: zip
#
apt-get install -y libz-dev && \
curl -o zip.tgz -SL http://pecl.php.net/get/zip-1.15.1.tgz && \
tar -xf zip.tgz -C /usr/src/php/ext/ && \
rm zip.tgz && \
mv /usr/src/php/ext/zip-1.15.1 /usr/src/php/ext/zip

RUN docker-php-ext-install memcached
RUN docker-php-ext-install memcache
RUN docker-php-ext-install zip


# Install needed php extensions: ldap
#
RUN apt-get install libldap2-dev -y && \
mv /usr/src/php/ext/zip-1.15.1 /usr/src/php/ext/zip && \
docker-php-ext-install zip && \
# Install needed php extensions: ldap
#
apt-get install libldap2-dev -y && \
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
docker-php-ext-install ldap

# Install needed wordpress extensions: WP-FFPC
#
RUN cd /usr/src/wordpress/wp-content/plugins && \
docker-php-ext-install ldap && \
# Install needed wordpress extensions: WP-FFPC
#
cd /usr/src/wordpress/wp-content/plugins && \
curl -o wp-ffpc.zip -L https://downloads.wordpress.org/plugin/wp-ffpc.zip && \
unzip -o wp-ffpc.zip && \
chown -R www-data:www-data wp-ffpc && \
rm -f wp-ffpc.zip

# Enable Wordpress Caching
RUN cd /usr/src/wordpress && ls -l && \
sed -ri -e "s#(<\?php)#\\1\ndefine('WP_CACHE', 'true');#g" wp-config-sample.php

# Install needed wordpress extensions: Simple-Ldap-Login
#
RUN cd /usr/src/wordpress/wp-content/plugins && \
unzip -o wp-ffpc.zip && \
chown -R www-data:www-data wp-ffpc && \
rm -f wp-ffpc.zip && \
# Enable Wordpress Caching
cd /usr/src/wordpress && ls -l && \
sed -ri -e "s#(<\?php)#\\1\ndefine('WP_CACHE', 'true');#g" wp-config-sample.php && \
# Install needed wordpress extensions: Simple-Ldap-Login
#
cd /usr/src/wordpress/wp-content/plugins && \
curl -o simple-ldap-login.zip -L https://downloads.wordpress.org/plugin/simple-ldap-login.1.6.0.zip && \
unzip -o simple-ldap-login.zip && \
chown -R www-data:www-data simple-ldap-login && \
rm -f simple-ldap-login.zip

# Cleanup
RUN rm -rf /var/lib/apt/lists/*
unzip -o simple-ldap-login.zip && \
chown -R www-data:www-data simple-ldap-login && \
rm -f simple-ldap-login.zip && \
# Cleanup
rm -rf /var/lib/apt/lists/*


# ENTRYPOINT resets CMD
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["php-fpm"]
CMD ["php-fpm"]