Skip to content
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

Update joomla #6201

Merged
merged 1 commit into from
Jul 1, 2019
Merged

Update joomla #6201

merged 1 commit into from
Jul 1, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 1, 2019

Changes:

- joomla-docker/docker-joomla@fa97bf9: Merge pull request joomla-docker/docker-joomla#79 from J0WI/nproc
- joomla-docker/docker-joomla@eae2051: Use all available cores to build PHP extensions
@tianon
Copy link
Member Author

tianon commented Jul 1, 2019

Diff:
diff --git a/joomla_php7.1-fpm-alpine/Dockerfile b/joomla_php7.1-fpm-alpine/Dockerfile
index 2d5e675..ee92f3d 100644
--- a/joomla_php7.1-fpm-alpine/Dockerfile
+++ b/joomla_php7.1-fpm-alpine/Dockerfile
@@ -26,7 +26,7 @@ RUN set -ex; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	docker-php-ext-configure ldap; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.1-fpm/Dockerfile b/joomla_php7.1-fpm/Dockerfile
index c422616..332987f 100644
--- a/joomla_php7.1-fpm/Dockerfile
+++ b/joomla_php7.1-fpm/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.1/Dockerfile b/joomla_php7.1/Dockerfile
index 72b8711..4af1526 100644
--- a/joomla_php7.1/Dockerfile
+++ b/joomla_php7.1/Dockerfile
@@ -26,7 +26,7 @@ RUN set -ex; \
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.2-fpm-alpine/Dockerfile b/joomla_php7.2-fpm-alpine/Dockerfile
index e112809..41725f7 100644
--- a/joomla_php7.2-fpm-alpine/Dockerfile
+++ b/joomla_php7.2-fpm-alpine/Dockerfile
@@ -25,7 +25,7 @@ RUN set -ex; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	docker-php-ext-configure ldap; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.2-fpm/Dockerfile b/joomla_php7.2-fpm/Dockerfile
index 77467fa..f71a7d4 100644
--- a/joomla_php7.2-fpm/Dockerfile
+++ b/joomla_php7.2-fpm/Dockerfile
@@ -22,7 +22,7 @@ RUN set -ex; \
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.2/Dockerfile b/joomla_php7.2/Dockerfile
index 761b993..c643fa4 100644
--- a/joomla_php7.2/Dockerfile
+++ b/joomla_php7.2/Dockerfile
@@ -25,7 +25,7 @@ RUN set -ex; \
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.3-fpm-alpine/Dockerfile b/joomla_php7.3-fpm-alpine/Dockerfile
index 1bf0e95..a9942d4 100644
--- a/joomla_php7.3-fpm-alpine/Dockerfile
+++ b/joomla_php7.3-fpm-alpine/Dockerfile
@@ -26,7 +26,7 @@ RUN set -ex; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	docker-php-ext-configure ldap; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.3-fpm/Dockerfile b/joomla_php7.3-fpm/Dockerfile
index 3098268..3624f5a 100644
--- a/joomla_php7.3-fpm/Dockerfile
+++ b/joomla_php7.3-fpm/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \
diff --git a/joomla_php7.3/Dockerfile b/joomla_php7.3/Dockerfile
index 9272d5a..470d62c 100644
--- a/joomla_php7.3/Dockerfile
+++ b/joomla_php7.3/Dockerfile
@@ -26,7 +26,7 @@ RUN set -ex; \
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
 		gd \
 		ldap \

@tianon
Copy link
Member Author

tianon commented Jul 1, 2019

Build test of #6201; 15bbadf; amd64 (joomla):

$ bashbrew build joomla:3.9.8-php7.1-apache
Building bashbrew/cache:9bb58f52419410533edc89133ae7ed1daaa8de9bc76d97d9628d328d4449bcb6 (joomla:3.9.8-php7.1-apache)
Tagging joomla:3.9.8-php7.1-apache
Tagging joomla:3.9-php7.1-apache
Tagging joomla:3-php7.1-apache
Tagging joomla:php7.1-apache
Tagging joomla:3.9.8-php7.1
Tagging joomla:3.9-php7.1
Tagging joomla:3-php7.1
Tagging joomla:php7.1

$ test/run.sh joomla:3.9.8-php7.1-apache
testing joomla:3.9.8-php7.1-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-php7.1-fpm
Building bashbrew/cache:342eed6ced35acd588c9e7875e04fa585aacdff766c43a3580280bc30022017f (joomla:3.9.8-php7.1-fpm)
Tagging joomla:3.9.8-php7.1-fpm
Tagging joomla:3.9-php7.1-fpm
Tagging joomla:3-php7.1-fpm
Tagging joomla:php7.1-fpm

$ test/run.sh joomla:3.9.8-php7.1-fpm
testing joomla:3.9.8-php7.1-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-php7.1-fpm-alpine
Building bashbrew/cache:22d5f214252c3d7f44ed0ea751aec844b83b6b1e01bb82419896f80c0d1d8162 (joomla:3.9.8-php7.1-fpm-alpine)
Tagging joomla:3.9.8-php7.1-fpm-alpine
Tagging joomla:3.9-php7.1-fpm-alpine
Tagging joomla:3-php7.1-fpm-alpine
Tagging joomla:php7.1-fpm-alpine

$ test/run.sh joomla:3.9.8-php7.1-fpm-alpine
testing joomla:3.9.8-php7.1-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-apache
Building bashbrew/cache:613efb063576e3d6509c70bde9b9d217e477ca4dc663b9f190b966484d2331fa (joomla:3.9.8-apache)
Tagging joomla:3.9.8-apache
Tagging joomla:3.9-apache
Tagging joomla:3-apache
Tagging joomla:apache
Tagging joomla:3.9.8
Tagging joomla:3.9
Tagging joomla:3
Tagging joomla:latest
Tagging joomla:3.9.8-php7.2-apache
Tagging joomla:3.9-php7.2-apache
Tagging joomla:3-php7.2-apache
Tagging joomla:php7.2-apache
Tagging joomla:3.9.8-php7.2
Tagging joomla:3.9-php7.2
Tagging joomla:3-php7.2
Tagging joomla:php7.2

$ test/run.sh joomla:3.9.8-apache
testing joomla:3.9.8-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-fpm
Building bashbrew/cache:efc51a3055835cb91eb4536a3ad834b38b939cbbc1f1fd8c131e70a0672a2fbd (joomla:3.9.8-fpm)
Tagging joomla:3.9.8-fpm
Tagging joomla:3.9-fpm
Tagging joomla:3-fpm
Tagging joomla:fpm
Tagging joomla:3.9.8-php7.2-fpm
Tagging joomla:3.9-php7.2-fpm
Tagging joomla:3-php7.2-fpm
Tagging joomla:php7.2-fpm

$ test/run.sh joomla:3.9.8-fpm
testing joomla:3.9.8-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-fpm-alpine
Building bashbrew/cache:7680ecb9695724ca616911ceefdea4f0a194ba9aeceea1ff6d3476aa65e016c4 (joomla:3.9.8-fpm-alpine)
Tagging joomla:3.9.8-fpm-alpine
Tagging joomla:3.9-fpm-alpine
Tagging joomla:3-fpm-alpine
Tagging joomla:fpm-alpine
Tagging joomla:3.9.8-php7.2-fpm-alpine
Tagging joomla:3.9-php7.2-fpm-alpine
Tagging joomla:3-php7.2-fpm-alpine
Tagging joomla:php7.2-fpm-alpine

$ test/run.sh joomla:3.9.8-fpm-alpine
testing joomla:3.9.8-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-php7.3-apache
Building bashbrew/cache:74e09f0a79cd4ecb7719e2cebc5c7a4067ba9f48014b2cebdbd33071b63b753e (joomla:3.9.8-php7.3-apache)
Tagging joomla:3.9.8-php7.3-apache
Tagging joomla:3.9-php7.3-apache
Tagging joomla:3-php7.3-apache
Tagging joomla:php7.3-apache
Tagging joomla:3.9.8-php7.3
Tagging joomla:3.9-php7.3
Tagging joomla:3-php7.3
Tagging joomla:php7.3

$ test/run.sh joomla:3.9.8-php7.3-apache
testing joomla:3.9.8-php7.3-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-php7.3-fpm
Building bashbrew/cache:2194dab0cb66574b376ed3a402f51cbbf028a5ab9828c6cdabbbdc6fd3372529 (joomla:3.9.8-php7.3-fpm)
Tagging joomla:3.9.8-php7.3-fpm
Tagging joomla:3.9-php7.3-fpm
Tagging joomla:3-php7.3-fpm
Tagging joomla:php7.3-fpm

$ test/run.sh joomla:3.9.8-php7.3-fpm
testing joomla:3.9.8-php7.3-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build joomla:3.9.8-php7.3-fpm-alpine
Building bashbrew/cache:d6ff9691694d1bed3d045bbd11e9506763f03b8e6f55f6e5b2e302134299e9c2 (joomla:3.9.8-php7.3-fpm-alpine)
Tagging joomla:3.9.8-php7.3-fpm-alpine
Tagging joomla:3.9-php7.3-fpm-alpine
Tagging joomla:3-php7.3-fpm-alpine
Tagging joomla:php7.3-fpm-alpine

$ test/run.sh joomla:3.9.8-php7.3-fpm-alpine
testing joomla:3.9.8-php7.3-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 19bfff6 into docker-library:master Jul 1, 2019
@tianon tianon deleted the joomla branch July 1, 2019 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants