From 5bf761104ebe98fb4355c2a60dcbd880785de3d0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 10 Oct 2024 12:09:00 -0700 Subject: [PATCH] Run update.sh --- mediawiki/README.md | 18 +++++++++--------- memcached/README.md | 24 +++++++++++++++++++++--- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/mediawiki/README.md b/mediawiki/README.md index 2c6b379fc24d..b4f58e1edd80 100644 --- a/mediawiki/README.md +++ b/mediawiki/README.md @@ -24,23 +24,23 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.42.3`, `1.42`, `stable`, `latest`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.42/apache/Dockerfile) +- [`1.42.3`, `1.42`, `stable`, `latest`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.42/apache/Dockerfile) -- [`1.42.3-fpm`, `1.42-fpm`, `stable-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.42/fpm/Dockerfile) +- [`1.42.3-fpm`, `1.42-fpm`, `stable-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.42/fpm/Dockerfile) -- [`1.42.3-fpm-alpine`, `1.42-fpm-alpine`, `stable-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.42/fpm-alpine/Dockerfile) +- [`1.42.3-fpm-alpine`, `1.42-fpm-alpine`, `stable-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.42/fpm-alpine/Dockerfile) -- [`1.41.4`, `1.41`, `legacy`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.41/apache/Dockerfile) +- [`1.41.4`, `1.41`, `legacy`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.41/apache/Dockerfile) -- [`1.41.4-fpm`, `1.41-fpm`, `legacy-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.41/fpm/Dockerfile) +- [`1.41.4-fpm`, `1.41-fpm`, `legacy-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.41/fpm/Dockerfile) -- [`1.41.4-fpm-alpine`, `1.41-fpm-alpine`, `legacy-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.41/fpm-alpine/Dockerfile) +- [`1.41.4-fpm-alpine`, `1.41-fpm-alpine`, `legacy-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.41/fpm-alpine/Dockerfile) -- [`1.39.10`, `1.39`, `lts`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.39/apache/Dockerfile) +- [`1.39.10`, `1.39`, `lts`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.39/apache/Dockerfile) -- [`1.39.10-fpm`, `1.39-fpm`, `lts-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.39/fpm/Dockerfile) +- [`1.39.10-fpm`, `1.39-fpm`, `lts-fpm`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.39/fpm/Dockerfile) -- [`1.39.10-fpm-alpine`, `1.39-fpm-alpine`, `lts-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/0b41a035fabebeda3d6b4ccc39e2c5fc3ce1cc19/1.39/fpm-alpine/Dockerfile) +- [`1.39.10-fpm-alpine`, `1.39-fpm-alpine`, `lts-fpm-alpine`](https://github.com/wikimedia/mediawiki-docker/blob/4708aabf22334d933a45f714e28a78722b36427a/1.39/fpm-alpine/Dockerfile) # Quick reference (cont.) diff --git a/memcached/README.md b/memcached/README.md index de1bc89e634d..59afca9e9fc9 100644 --- a/memcached/README.md +++ b/memcached/README.md @@ -61,13 +61,31 @@ Memcached's APIs provide a very large hash table distributed across multiple mac $ docker run --name my-memcache -d memcached ``` -## Setting Memory Usage +### Configuration + +To customize the configuration of the memcached server, first obtain the upstream configuration options from the container: ```console -$ docker run --name my-memcache -d memcached memcached -m 64 +$ docker run --rm memcached -h ``` -This would set the Memcached server to use 64 megabytes for storage. +Using `docker run`: + +```console +$ docker run --name my-memcache -d memcached memcached --memory-limit=64 +``` + +or using Docker Compose: + +```yaml +services: + memcached: + image: memcached + command: + - --conn-limit=1024 + - --memory-limit=64 + - --threads=4 +``` For infomation on configuring your memcached server, see the extensive [wiki](https://github.com/memcached/memcached/wiki).