Browse Source

Run update.sh

Docker Library Bot 1 year ago
parent
commit
5bf761104e
2 changed files with 30 additions and 12 deletions
  1. 9 9
      mediawiki/README.md
  2. 21 3
      memcached/README.md

+ 9 - 9
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.)
 

+ 21 - 3
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).