Skip to content

Add MediaWiki 1.31#4463

Merged
tianon merged 1 commit into
docker-library:masterfrom
davidbarratt:mediawiki
Jun 15, 2018
Merged

Add MediaWiki 1.31#4463
tianon merged 1 commit into
docker-library:masterfrom
davidbarratt:mediawiki

Conversation

@davidbarratt
Copy link
Copy Markdown
Contributor

Updates MediaWiki

@tianon
Copy link
Copy Markdown
Member

tianon commented Jun 15, 2018

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index dc8bb6b..36d1546 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,3 @@
 mediawiki:1.27.4 @ amd64
-mediawiki:1.29.2 @ amd64
 mediawiki:1.30.0 @ amd64
+mediawiki:1.31.0 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 2d8d6ea..f646630 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,9 @@
 mediawiki:1.27
 mediawiki:1.27.4
-mediawiki:1.29
-mediawiki:1.29.2
 mediawiki:1.30
 mediawiki:1.30.0
+mediawiki:1.31
+mediawiki:1.31.0
 mediawiki:latest
 mediawiki:legacy
 mediawiki:lts
diff --git a/mediawiki_1.29.2/Dockerfile b/mediawiki_1.31.0/Dockerfile
similarity index 80%
rename from mediawiki_1.29.2/Dockerfile
rename to mediawiki_1.31.0/Dockerfile
index fbc1479..0e2fd46 100644
--- a/mediawiki_1.29.2/Dockerfile
+++ b/mediawiki_1.31.0/Dockerfile
@@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \
 		git \
 		imagemagick \
 		libicu-dev \
-		# Required for SytaxHighlighting
-		python \
+		# Required for SyntaxHighlighting
+		python3 \
 	--no-install-recommends && rm -r /var/lib/apt/lists/*
 
 # Install the PHP extensions we need
@@ -14,7 +14,7 @@ RUN docker-php-ext-install mbstring mysqli opcache intl
 
 # Install the default object cache.
 RUN pecl channel-update pecl.php.net \
-	&& pecl install apcu-5.1.8 \
+	&& pecl install apcu \
 	&& docker-php-ext-enable apcu
 
 # set recommended PHP.ini settings
@@ -33,10 +33,10 @@ RUN mkdir -p /var/www/data \
 	&& chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.29
-ENV MEDIAWIKI_BRANCH REL1_29
-ENV MEDIAWIKI_VERSION 1.29.2
-ENV MEDIAWIKI_SHA512 53c6ca82280938d1e3281aa296f44c86dcfbbdf82710b7de578e73e1ef3150db145e059c8c8208859bc437f7a7f7a13eed896be9d44fd364a0ee6d78893fbe86
+ENV MEDIAWIKI_MAJOR_VERSION 1.31
+ENV MEDIAWIKI_BRANCH REL1_31
+ENV MEDIAWIKI_VERSION 1.31.0
+ENV MEDIAWIKI_SHA512 50ad9303b0c0bd8380dea7489be18a4022d5b65a31961af8d36c3c9ff6d74cdf25e8e10137ef1e025b4287e9ee9b7e0bf4198ca342a46ab42915c91f1ddaf940
 
 # MediaWiki setup
 RUN curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz \

@tianon
Copy link
Copy Markdown
Member

tianon commented Jun 15, 2018

LGTM

Build test of #4463; 9dbe3e6; amd64 (mediawiki):

$ bashbrew build mediawiki:stable
Building bashbrew/cache:4221955b91221e26e71d292400d6f5fc9d9a1c410d22f688160a828753918e57 (mediawiki:stable)
Tagging mediawiki:stable
Tagging mediawiki:latest
Tagging mediawiki:1.31
Tagging mediawiki:1.31.0

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


$ bashbrew build mediawiki:legacy
Building bashbrew/cache:b2f73ecb6748b4c338c409417d1484048a31c2e0bde1dc6ea00c02a578e2899d (mediawiki:legacy)
Tagging mediawiki:legacy
Tagging mediawiki:1.30
Tagging mediawiki:1.30.0

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


$ bashbrew build mediawiki:lts
Building bashbrew/cache:2edafe5b6581c55e543c0846e3ba45ee146cadfdfa0ab564f7de2c243f86d0ea (mediawiki:lts)
Tagging mediawiki:lts
Tagging mediawiki:1.27
Tagging mediawiki:1.27.4

$ test/run.sh mediawiki:lts
testing mediawiki:lts
	'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 4c31b12 into docker-library:master Jun 15, 2018
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.

3 participants