Commit 595b04a7 authored by Addshore's avatar Addshore 🏄
Browse files

dev: Switch default mediawiki image to php 7.3

parent 667692ff
...@@ -256,7 +256,6 @@ var mwddMediawikiInstallCmd = &cobra.Command{ ...@@ -256,7 +256,6 @@ var mwddMediawikiInstallCmd = &cobra.Command{
if err == nil { if err == nil {
mwdd.DefaultForUser().DockerExec(mwdd.DockerExecCommand{ mwdd.DefaultForUser().DockerExec(mwdd.DockerExecCommand{
DockerComposeService: "mediawiki", DockerComposeService: "mediawiki",
// --ignore-platform-reqs is currently used as only PHP7.2 is provided and some things need higher
Command: []string{"composer", "install", "--ignore-platform-reqs", "--no-interaction"}, Command: []string{"composer", "install", "--ignore-platform-reqs", "--no-interaction"},
User: User, User: User,
}) })
......
...@@ -3,7 +3,7 @@ version: '3.7' ...@@ -3,7 +3,7 @@ version: '3.7'
services: services:
mediawiki: mediawiki:
image: "${MEDIAWIKI_IMAGE:-docker-registry.wikimedia.org/dev/stretch-php72-fpm:3.0.0}" image: "${MEDIAWIKI_IMAGE:-docker-registry.wikimedia.org/dev/stretch-php73-fpm:3.0.0}"
entrypoint: "/mwdd/entrypoint.sh" entrypoint: "/mwdd/entrypoint.sh"
volumes: volumes:
- ./wait-for-it.sh:/wait-for-it.sh:ro - ./wait-for-it.sh:/wait-for-it.sh:ro
......
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
chmod 777 /var/www/html/w/images/docker chmod 777 /var/www/html/w/images/docker
# Then execute the regular entrypoint # Then execute the regular entrypoint
# https://gerrit.wikimedia.org/r/plugins/gitiles/releng/dev-images/+/refs/heads/master/dockerfiles/stretch-php72-fpm/Dockerfile.template#32 # https://gerrit.wikimedia.org/r/plugins/gitiles/releng/dev-images/+/refs/heads/master/dockerfiles/stretch-php73-fpm/Dockerfile.template#32
/php_entrypoint.sh $@ /php_entrypoint.sh $@
...@@ -17,7 +17,7 @@ if [[ ! -f mediawiki/.gitlab-ci.cache.20210809-02 ]]; then ...@@ -17,7 +17,7 @@ if [[ ! -f mediawiki/.gitlab-ci.cache.20210809-02 ]]; then
mkdir mediawiki/vendor mkdir mediawiki/vendor
tar -xf vendor.tar.gz -C mediawiki/vendor tar -xf vendor.tar.gz -C mediawiki/vendor
rm -r *.tar.gz rm -r *.tar.gz
docker run --rm -v $PWD/mediawiki:/app -w /app --entrypoint=composer docker-registry.wikimedia.org/dev/stretch-php72-fpm:3.0.0 install --ignore-platform-reqs --no-interaction docker run --rm -v $PWD/mediawiki:/app -w /app --entrypoint=composer docker-registry.wikimedia.org/dev/stretch-php73-fpm:3.0.0 install --ignore-platform-reqs --no-interaction
touch mediawiki/.gitlab-ci.cache.20210809-02 touch mediawiki/.gitlab-ci.cache.20210809-02
fi fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment