From abcdaa500d097df5677163bf93888e1fa23ecc8a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 4 Sep 2020 01:09:52 +0000 Subject: [PATCH] Run update.sh --- mediawiki/README.md | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/mediawiki/README.md b/mediawiki/README.md index 34f66f063..be5dcd94c 100644 --- a/mediawiki/README.md +++ b/mediawiki/README.md @@ -24,9 +24,15 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.34.2`, `1.34`, `stable`, `latest`](https://github.com/wikimedia/mediawiki-docker/blob/fc6333cecb419c11e84b8c79b547eef6dfc54b17/1.34/Dockerfile) -- [`1.33.4`, `1.33`, `legacy`](https://github.com/wikimedia/mediawiki-docker/blob/fc6333cecb419c11e84b8c79b547eef6dfc54b17/1.33/Dockerfile) -- [`1.31.8`, `1.31`, `lts`, `legacylts`](https://github.com/wikimedia/mediawiki-docker/blob/fc6333cecb419c11e84b8c79b547eef6dfc54b17/1.31/Dockerfile) +- [`1.34.2`, `1.34`, `stable`, `latest`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.34/apache/Dockerfile) +- [`1.34.2-fpm`, `1.34-fpm`, `stable-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.34/fpm/Dockerfile) +- [`1.34.2-fpm-alpine`, `1.34-fpm-alpine`, `stable-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.34/fpm-alpine/Dockerfile) +- [`1.33.4`, `1.33`, `legacy`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.33/apache/Dockerfile) +- [`1.33.4-fpm`, `1.33-fpm`, `legacy-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.33/fpm/Dockerfile) +- [`1.33.4-fpm-alpine`, `1.33-fpm-alpine`, `legacy-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.33/fpm-alpine/Dockerfile) +- [`1.31.8`, `1.31`, `lts`, `legacylts`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.31/apache/Dockerfile) +- [`1.31.8-fpm`, `1.31-fpm`, `lts-fpm`, `legacylts-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.31/fpm/Dockerfile) +- [`1.31.8-fpm-alpine`, `1.31-fpm-alpine`, `lts-fpm-alpine`, `legacylts-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/9c1e9bdec7d96abd3a1a497da6f4d684b41dc551/1.31/fpm-alpine/Dockerfile) # Quick reference (cont.) @@ -34,7 +40,7 @@ WARNING: [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)) - [`amd64`](https://hub.docker.com/r/amd64/mediawiki/), [`arm32v5`](https://hub.docker.com/r/arm32v5/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/) + [`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)) @@ -144,6 +150,22 @@ The following Docker Hub features can help with the task of keeping your depende - [Automated Builds](https://docs.docker.com/docker-hub/builds/) let Docker Hub automatically build your Dockerfile each time you push changes to it. +# Image Variants + +The `mediawiki` images come in many flavors, each designed for a specific use case. + +## `mediawiki:` + +This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. + +## `mediawiki:-alpine` + +This image is based on the popular [Alpine Linux project](https://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. + +This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](https://musl.libc.org) instead of [glibc and friends](https://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. + +To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). + # License View [license information](https://phabricator.wikimedia.org/source/mediawiki/browse/master/COPYING) for the software contained in this image.