From 29dc507be32d6299f47b6778fe407d95e552c799 Mon Sep 17 00:00:00 2001 From: Andrei Kashin Date: Tue, 28 Dec 2021 15:16:36 +0000 Subject: [PATCH 1/3] Add comment about database host name This will make it easier to set up the mediawiki for users not intimately familiar with Docker Stacks conventions for service host naming. I was lucky to find the answer to this problem on https://stackoverflow.com/questions/57312109/mediawiki-docker-official-image-connection-refused-by-mysql, but having it in the docs would make the setup much more smooth. --- mediawiki/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/mediawiki/README.md b/mediawiki/README.md index c4e7c28d4111..980656413cb4 100644 --- a/mediawiki/README.md +++ b/mediawiki/README.md @@ -125,6 +125,7 @@ services: # this yaml and uncomment the following line and use compose to restart # the mediawiki service # - ./LocalSettings.php:/var/www/html/LocalSettings.php + # This key also defines the name of the database host used during setup instead of the default "localhost" database: image: mariadb restart: always From ab65281fd5fb0fb56498eb00bc70ee3a24d2579b Mon Sep 17 00:00:00 2001 From: Andrei Kashin Date: Thu, 30 Dec 2021 14:51:08 +0000 Subject: [PATCH 2/3] Move the changes from auto-generated README to stack.yml --- mediawiki/README.md | 19 +++++++++---------- mediawiki/stack.yml | 1 + 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mediawiki/README.md b/mediawiki/README.md index 980656413cb4..fca6366f821c 100644 --- a/mediawiki/README.md +++ b/mediawiki/README.md @@ -16,10 +16,10 @@ WARNING: # Quick reference -- **Maintained by**: +- **Maintained by**: [MediaWiki community & Docker Community](https://github.com/wikimedia/mediawiki-docker) -- **Where to get help**: +- **Where to get help**: [the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker) # Supported tags and respective `Dockerfile` links @@ -36,21 +36,21 @@ WARNING: # Quick reference (cont.) -- **Where to file issues**: +- **Where to file issues**: [https://phabricator.wikimedia.org/project/view/3094/](https://phabricator.wikimedia.org/project/view/3094/) -- **Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64)) +- **Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64)) [`amd64`](https://hub.docker.com/r/amd64/mediawiki/), [`arm32v5`](https://hub.docker.com/r/arm32v5/mediawiki/), [`arm32v6`](https://hub.docker.com/r/arm32v6/mediawiki/), [`arm32v7`](https://hub.docker.com/r/arm32v7/mediawiki/), [`arm64v8`](https://hub.docker.com/r/arm64v8/mediawiki/), [`i386`](https://hub.docker.com/r/i386/mediawiki/), [`ppc64le`](https://hub.docker.com/r/ppc64le/mediawiki/) -- **Published image artifact details**: - [repo-info repo's `repos/mediawiki/` directory](https://github.com/docker-library/repo-info/blob/master/repos/mediawiki) ([history](https://github.com/docker-library/repo-info/commits/master/repos/mediawiki)) +- **Published image artifact details**: + [repo-info repo's `repos/mediawiki/` directory](https://github.com/docker-library/repo-info/blob/master/repos/mediawiki) ([history](https://github.com/docker-library/repo-info/commits/master/repos/mediawiki)) (image metadata, transfer size, etc) -- **Image updates**: - [official-images repo's `library/mediawiki` label](https://github.com/docker-library/official-images/issues?q=label%3Alibrary%2Fmediawiki) +- **Image updates**: + [official-images repo's `library/mediawiki` label](https://github.com/docker-library/official-images/issues?q=label%3Alibrary%2Fmediawiki) [official-images repo's `library/mediawiki` file](https://github.com/docker-library/official-images/blob/master/library/mediawiki) ([history](https://github.com/docker-library/official-images/commits/master/library/mediawiki)) -- **Source of this description**: +- **Source of this description**: [docs repo's `mediawiki/` directory](https://github.com/docker-library/docs/tree/master/mediawiki) ([history](https://github.com/docker-library/docs/commits/master/mediawiki)) # What is MediaWiki? @@ -125,7 +125,6 @@ services: # this yaml and uncomment the following line and use compose to restart # the mediawiki service # - ./LocalSettings.php:/var/www/html/LocalSettings.php - # This key also defines the name of the database host used during setup instead of the default "localhost" database: image: mariadb restart: always diff --git a/mediawiki/stack.yml b/mediawiki/stack.yml index 04e637fb45ad..29e6a04de811 100644 --- a/mediawiki/stack.yml +++ b/mediawiki/stack.yml @@ -17,6 +17,7 @@ services: # this yaml and uncomment the following line and use compose to restart # the mediawiki service # - ./LocalSettings.php:/var/www/html/LocalSettings.php + # This key also defines the name of the database host used during setup instead of the default "localhost" database: image: mariadb restart: always From 5abdbde83ed6c56e8d28093befc6f04012a03ada Mon Sep 17 00:00:00 2001 From: Andrei Kashin Date: Thu, 30 Dec 2021 15:01:55 +0000 Subject: [PATCH 3/3] Remove auto-formatting newlines from Codespaces --- mediawiki/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mediawiki/README.md b/mediawiki/README.md index fca6366f821c..c4e7c28d4111 100644 --- a/mediawiki/README.md +++ b/mediawiki/README.md @@ -16,10 +16,10 @@ WARNING: # Quick reference -- **Maintained by**: +- **Maintained by**: [MediaWiki community & Docker Community](https://github.com/wikimedia/mediawiki-docker) -- **Where to get help**: +- **Where to get help**: [the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker) # Supported tags and respective `Dockerfile` links @@ -36,21 +36,21 @@ WARNING: # Quick reference (cont.) -- **Where to file issues**: +- **Where to file issues**: [https://phabricator.wikimedia.org/project/view/3094/](https://phabricator.wikimedia.org/project/view/3094/) -- **Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64)) +- **Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64)) [`amd64`](https://hub.docker.com/r/amd64/mediawiki/), [`arm32v5`](https://hub.docker.com/r/arm32v5/mediawiki/), [`arm32v6`](https://hub.docker.com/r/arm32v6/mediawiki/), [`arm32v7`](https://hub.docker.com/r/arm32v7/mediawiki/), [`arm64v8`](https://hub.docker.com/r/arm64v8/mediawiki/), [`i386`](https://hub.docker.com/r/i386/mediawiki/), [`ppc64le`](https://hub.docker.com/r/ppc64le/mediawiki/) -- **Published image artifact details**: - [repo-info repo's `repos/mediawiki/` directory](https://github.com/docker-library/repo-info/blob/master/repos/mediawiki) ([history](https://github.com/docker-library/repo-info/commits/master/repos/mediawiki)) +- **Published image artifact details**: + [repo-info repo's `repos/mediawiki/` directory](https://github.com/docker-library/repo-info/blob/master/repos/mediawiki) ([history](https://github.com/docker-library/repo-info/commits/master/repos/mediawiki)) (image metadata, transfer size, etc) -- **Image updates**: - [official-images repo's `library/mediawiki` label](https://github.com/docker-library/official-images/issues?q=label%3Alibrary%2Fmediawiki) +- **Image updates**: + [official-images repo's `library/mediawiki` label](https://github.com/docker-library/official-images/issues?q=label%3Alibrary%2Fmediawiki) [official-images repo's `library/mediawiki` file](https://github.com/docker-library/official-images/blob/master/library/mediawiki) ([history](https://github.com/docker-library/official-images/commits/master/library/mediawiki)) -- **Source of this description**: +- **Source of this description**: [docs repo's `mediawiki/` directory](https://github.com/docker-library/docs/tree/master/mediawiki) ([history](https://github.com/docker-library/docs/commits/master/mediawiki)) # What is MediaWiki?