Skip to content

Introduce templates and a PHP 7.0-based variant #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2016

Conversation

tianon
Copy link
Member

@tianon tianon commented Oct 6, 2016

Closes #106

@tianon
Copy link
Member Author

tianon commented Oct 6, 2016

$ ./update.sh
+ sed -r -e 's!%%WORDPRESS_VERSION%%!4.6.1!g' -e 's!%%WORDPRESS_SHA1%%!027e065d30a64720624a7404a1820e6c6fff1202!g' -e 's!%%PHP_VERSION%%!5.6!g' -e 's!%%VARIANT%%!apache!g' -e 's!%%VARIANT_EXTRAS%%!\nRUN a2enmod rewrite expires\n!g' -e 's!%%CMD%%!apache2-foreground!g' Dockerfile.template
+ cp docker-entrypoint.sh php5.6/apache/docker-entrypoint.sh
+ sed -r -e 's!%%WORDPRESS_VERSION%%!4.6.1!g' -e 's!%%WORDPRESS_SHA1%%!027e065d30a64720624a7404a1820e6c6fff1202!g' -e 's!%%PHP_VERSION%%!5.6!g' -e 's!%%VARIANT%%!fpm!g' -e 's!%%VARIANT_EXTRAS%%!!g' -e 's!%%CMD%%!php-fpm!g' Dockerfile.template
+ cp docker-entrypoint.sh php5.6/fpm/docker-entrypoint.sh
+ sed -r -e 's!%%WORDPRESS_VERSION%%!4.6.1!g' -e 's!%%WORDPRESS_SHA1%%!027e065d30a64720624a7404a1820e6c6fff1202!g' -e 's!%%PHP_VERSION%%!7.0!g' -e 's!%%VARIANT%%!apache!g' -e 's!%%VARIANT_EXTRAS%%!\nRUN a2enmod rewrite expires\n!g' -e 's!%%CMD%%!apache2-foreground!g' Dockerfile.template
+ cp docker-entrypoint.sh php7.0/apache/docker-entrypoint.sh
+ sed -r -e 's!%%WORDPRESS_VERSION%%!4.6.1!g' -e 's!%%WORDPRESS_SHA1%%!027e065d30a64720624a7404a1820e6c6fff1202!g' -e 's!%%PHP_VERSION%%!7.0!g' -e 's!%%VARIANT%%!fpm!g' -e 's!%%VARIANT_EXTRAS%%!!g' -e 's!%%CMD%%!php-fpm!g' Dockerfile.template
+ cp docker-entrypoint.sh php7.0/fpm/docker-entrypoint.sh

@tianon
Copy link
Member Author

tianon commented Oct 6, 2016

$ ./generate-stackbrew-library.sh
# this file is generated via https://github.com/docker-library/wordpress/blob/59bef72c8348e3e09e139c9a219cb0ee7a4612a3/generate-stackbrew-library.sh

Maintainers: Tianon Gravi <[email protected]> (@tianon),
             Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/wordpress.git

Tags: 4.6.1-apache, 4.6-apache, 4-apache, apache, 4.6.1, 4.6, 4, latest, 4.6.1-php5.6, 4.6-php5.6, 4-php5.6, php5.6, 4.6.1-php5.6-apache, 4.6-php5.6-apache, 4-php5.6-apache, php5.6-apache
GitCommit: 59bef72c8348e3e09e139c9a219cb0ee7a4612a3
Directory: php5.6/apache

Tags: 4.6.1-fpm, 4.6-fpm, 4-fpm, fpm, 4.6.1-php5.6-fpm, 4.6-php5.6-fpm, 4-php5.6-fpm, php5.6-fpm
GitCommit: 59bef72c8348e3e09e139c9a219cb0ee7a4612a3
Directory: php5.6/fpm

Tags: 4.6.1-php7.0, 4.6-php7.0, 4-php7.0, php7.0, 4.6.1-php7.0-apache, 4.6-php7.0-apache, 4-php7.0-apache, php7.0-apache
GitCommit: 59bef72c8348e3e09e139c9a219cb0ee7a4612a3
Directory: php7.0/apache

Tags: 4.6.1-php7.0-fpm, 4.6-php7.0-fpm, 4-php7.0-fpm, php7.0-fpm
GitCommit: 59bef72c8348e3e09e139c9a219cb0ee7a4612a3
Directory: php7.0/fpm

@tianon
Copy link
Member Author

tianon commented Oct 6, 2016

$ diff -u <(bashbrew list wordpress | cut -d: -f2) <(bashbrew list <(./generate-stackbrew-library.sh) | cut -d: -f2)
--- /dev/fd/63  2016-10-06 13:01:48.058622142 -0700
+++ /dev/fd/62  2016-10-06 13:01:48.059622113 -0700
@@ -6,7 +6,31 @@
 4.6
 4
 latest
+4.6.1-php5.6
+4.6-php5.6
+4-php5.6
+php5.6
+4.6.1-php5.6-apache
+4.6-php5.6-apache
+4-php5.6-apache
+php5.6-apache
 4.6.1-fpm
 4.6-fpm
 4-fpm
 fpm
+4.6.1-php5.6-fpm
+4.6-php5.6-fpm
+4-php5.6-fpm
+php5.6-fpm
+4.6.1-php7.0
+4.6-php7.0
+4-php7.0
+php7.0
+4.6.1-php7.0-apache
+4.6-php7.0-apache
+4-php7.0-apache
+php7.0-apache
+4.6.1-php7.0-fpm
+4.6-php7.0-fpm
+4-php7.0-fpm
+php7.0-fpm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants