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

Upgrade MediaWiki 1.32 #5286

Merged
merged 1 commit into from
Jan 14, 2019
Merged

Conversation

davidbarratt
Copy link
Contributor

@legoktm
Copy link
Contributor

legoktm commented Jan 12, 2019

CI seems to be failing because the php7.0 images were removed in docker-library/php#773

Do we need to bump them to 7.1 (or 7.2) now?

@davidbarratt
Copy link
Contributor Author

@legoktm
Looks like it. wikimedia/mediawiki-docker#58

@addshore
Copy link
Contributor

@legoktm
Looks like it. wikimedia/mediawiki-docker#58

I just merged that PR, I guess we should now update this one?

@davidbarratt
Copy link
Contributor Author

@addshore updated!

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index eca6097..577ec13 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,7 +5,7 @@ mediawiki:1.30.1
 mediawiki:1.31
 mediawiki:1.31.1
 mediawiki:1.32
-mediawiki:1.32.0-rc.2
+mediawiki:1.32.0
 mediawiki:latest
 mediawiki:legacy
 mediawiki:legacylts
diff --git a/mediawiki_1.32/Dockerfile b/mediawiki_1.32/Dockerfile
index 20b8b78..3a1bfe5 100644
--- a/mediawiki_1.32/Dockerfile
+++ b/mediawiki_1.32/Dockerfile
@@ -47,8 +47,8 @@ RUN mkdir -p /var/www/data \
 # Version
 ENV MEDIAWIKI_MAJOR_VERSION 1.32
 ENV MEDIAWIKI_BRANCH REL1_32
-ENV MEDIAWIKI_VERSION 1.32.0-rc.2
-ENV MEDIAWIKI_SHA512 a68f9fbebe6c36b5af1e84a54dffe4e4abef232bdca30d104ae33585a2945998223612db8ee6f131bdd00a92be2b8c529f2ce5f0afc53878e5f562c753bf5b0b
+ENV MEDIAWIKI_VERSION 1.32.0
+ENV MEDIAWIKI_SHA512 5e198844bba12f5a3a73a05dd7d855d3e883914c6e7c23676921a169dc1c7089ed31adfb7369c24cbaf10b43171dd2a12929284b65edde44d7b9721385ff1cc3
 
 # MediaWiki setup
 RUN curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz \
diff --git a/mediawiki_legacylts/Dockerfile b/mediawiki_legacylts/Dockerfile
index f8126b9..7e3ebfc 100644
--- a/mediawiki_legacylts/Dockerfile
+++ b/mediawiki_legacylts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.0-apache
+FROM php:7.1-apache
 
 # System Dependencies.
 RUN apt-get update && apt-get install -y \

@yosifkit
Copy link
Member

Build test of #5286; 2124364; amd64 (mediawiki):

$ bashbrew build mediawiki:1.32.0
Using bashbrew/cache:030d59f5ca1ca6d6d2f5e12de016f6d71555337ce00a7d44be10fc928cc4c56a (mediawiki:1.32.0)
Tagging mediawiki:1.32.0
Tagging mediawiki:1.32

$ test/run.sh mediawiki:1.32.0
testing mediawiki:1.32.0
	'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:1.31.1
Using bashbrew/cache:c99446fb1abf3dee15b0de4b15086b80cc5722797f30bab82fdd214aadae7b82 (mediawiki:1.31.1)
Tagging mediawiki:1.31.1
Tagging mediawiki:1.31
Tagging mediawiki:lts
Tagging mediawiki:stable
Tagging mediawiki:latest

$ test/run.sh mediawiki:1.31.1
testing mediawiki:1.31.1
	'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:1.30.1
Using bashbrew/cache:0febd5714ffa4e0b737f1e494cb3c34dcba822e365df2aa7cc7a5429e1f944ca (mediawiki:1.30.1)
Tagging mediawiki:1.30.1
Tagging mediawiki:1.30
Tagging mediawiki:legacy

$ test/run.sh mediawiki:1.30.1
testing mediawiki:1.30.1
	'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:1.27.5
Using bashbrew/cache:062445548ad7785c2910d9724dd650f66d270df556e544e1d77297308977720c (mediawiki:1.27.5)
Tagging mediawiki:1.27.5
Tagging mediawiki:1.27
Tagging mediawiki:legacylts

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

@yosifkit yosifkit merged commit 24f6489 into docker-library:master Jan 14, 2019
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.

5 participants