diff --git a/bash/README.md b/bash/README.md index e8894227f..71bef866a 100644 --- a/bash/README.md +++ b/bash/README.md @@ -24,7 +24,7 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`devel-20240202`, `devel`, `devel-20240202-alpine3.19`, `devel-alpine3.19`](https://github.com/tianon/docker-bash/blob/af207d7a2d6dd7dffba1cfde7f231cbee8d4ddab/devel/Dockerfile) +- [`devel-20240209`, `devel`, `devel-20240209-alpine3.19`, `devel-alpine3.19`](https://github.com/tianon/docker-bash/blob/9a5be2bc9807616a717893593b8ab24224428059/devel/Dockerfile) - [`5.2.26`, `5.2`, `5`, `latest`, `5.2.26-alpine3.19`, `5.2-alpine3.19`, `5-alpine3.19`, `alpine3.19`](https://github.com/tianon/docker-bash/blob/3eae20ac57eaeb63ef9e438b67bfc135a948995a/5.2/Dockerfile) - [`5.1.16`, `5.1`, `5.1.16-alpine3.19`, `5.1-alpine3.19`](https://github.com/tianon/docker-bash/blob/a3f660ae2fcc3153c697520ef4e08da800578064/5.1/Dockerfile) - [`5.0.18`, `5.0`, `5.0.18-alpine3.19`, `5.0-alpine3.19`](https://github.com/tianon/docker-bash/blob/e78939e417c6efbfd55e48c80088bdbbae29fd66/5.0/Dockerfile) diff --git a/postgres/README.md b/postgres/README.md index 915a5272a..65a2c1fc6 100644 --- a/postgres/README.md +++ b/postgres/README.md @@ -108,13 +108,21 @@ Example `docker-compose.yml` for `postgres`: ```yaml # Use postgres/example user/password credentials -version: '3.1' +version: '3.9' services: db: image: postgres restart: always + # set shared memory limit when using docker-compose + shm_size: 128mb + # or set shared memory limit when deploy via swarm stack + #volumes: + # - type: tmpfs + # target: /dev/shm + # tmpfs: + # size: 134217728 # 128*2^20 bytes = 128Mb environment: POSTGRES_PASSWORD: example @@ -125,7 +133,7 @@ services: - 8080:8080 ``` -[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/9efeec18b6b2ed232cf0fbd3914b6211e16e242c/postgres/stack.yml) +[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/f254f585ba82d2e19d794100dd7bca71fb1c02e7/postgres/stack.yml) Run `docker stack deploy -c stack.yml postgres` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate). @@ -332,7 +340,7 @@ The three easiest ways to get around this: If there is no database when `postgres` starts in a container, then `postgres` will create the default database for you. While this is the expected behavior of `postgres`, this means that it will not accept incoming connections during that time. This may cause issues when using automation tools, such as `docker-compose`, that start several containers simultaneously. -Also note that the default `/dev/shm` size for containers is 64MB. If the shared memory is exhausted you will encounter `ERROR: could not resize shared memory segment . . . : No space left on device`. You will want to pass [`--shm-size=256MB`](https://docs.docker.com/engine/reference/run/#runtime-constraints-on-resources) for example to `docker run`, or alternatively in [`docker-compose`](https://docs.docker.com/compose/compose-file/#shm_size). +Also note that the default `/dev/shm` size for containers is 64MB. If the shared memory is exhausted you will encounter `ERROR: could not resize shared memory segment . . . : No space left on device`. You will want to pass [`--shm-size=256MB`](https://docs.docker.com/engine/reference/run/#runtime-constraints-on-resources) for example to `docker run`, or alternatively in [`docker-compose`](https://docs.docker.com/compose/compose-file/05-services/#shm_size). ## Where to Store Data diff --git a/wordpress/README.md b/wordpress/README.md index c8e3bddb6..4f2f1d497 100644 --- a/wordpress/README.md +++ b/wordpress/README.md @@ -36,6 +36,15 @@ WARNING: - [`cli-2.10.0-php8.1`, `cli-2.10-php8.1`, `cli-2-php8.1`, `cli-php8.1`](https://github.com/docker-library/wordpress/blob/bb6296613aad365656cbba4933c2f7bd135bf243/cli/php8.1/alpine/Dockerfile) - [`cli-2.10.0`, `cli-2.10`, `cli-2`, `cli`, `cli-2.10.0-php8.2`, `cli-2.10-php8.2`, `cli-2-php8.2`, `cli-php8.2`](https://github.com/docker-library/wordpress/blob/bb6296613aad365656cbba4933c2f7bd135bf243/cli/php8.2/alpine/Dockerfile) - [`cli-2.10.0-php8.3`, `cli-2.10-php8.3`, `cli-2-php8.3`, `cli-php8.3`](https://github.com/docker-library/wordpress/blob/bb6296613aad365656cbba4933c2f7bd135bf243/cli/php8.3/alpine/Dockerfile) +- [`beta-6.5-beta1-php8.1-apache`, `beta-6.5-php8.1-apache`, `beta-6-php8.1-apache`, `beta-php8.1-apache`, `beta-6.5-beta1-php8.1`, `beta-6.5-php8.1`, `beta-6-php8.1`, `beta-php8.1`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.1/apache/Dockerfile) +- [`beta-6.5-beta1-php8.1-fpm`, `beta-6.5-php8.1-fpm`, `beta-6-php8.1-fpm`, `beta-php8.1-fpm`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.1/fpm/Dockerfile) +- [`beta-6.5-beta1-php8.1-fpm-alpine`, `beta-6.5-php8.1-fpm-alpine`, `beta-6-php8.1-fpm-alpine`, `beta-php8.1-fpm-alpine`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.1/fpm-alpine/Dockerfile) +- [`beta-6.5-beta1-apache`, `beta-6.5-apache`, `beta-6-apache`, `beta-apache`, `beta-6.5-beta1`, `beta-6.5`, `beta-6`, `beta`, `beta-6.5-beta1-php8.2-apache`, `beta-6.5-php8.2-apache`, `beta-6-php8.2-apache`, `beta-php8.2-apache`, `beta-6.5-beta1-php8.2`, `beta-6.5-php8.2`, `beta-6-php8.2`, `beta-php8.2`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.2/apache/Dockerfile) +- [`beta-6.5-beta1-fpm`, `beta-6.5-fpm`, `beta-6-fpm`, `beta-fpm`, `beta-6.5-beta1-php8.2-fpm`, `beta-6.5-php8.2-fpm`, `beta-6-php8.2-fpm`, `beta-php8.2-fpm`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.2/fpm/Dockerfile) +- [`beta-6.5-beta1-fpm-alpine`, `beta-6.5-fpm-alpine`, `beta-6-fpm-alpine`, `beta-fpm-alpine`, `beta-6.5-beta1-php8.2-fpm-alpine`, `beta-6.5-php8.2-fpm-alpine`, `beta-6-php8.2-fpm-alpine`, `beta-php8.2-fpm-alpine`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.2/fpm-alpine/Dockerfile) +- [`beta-6.5-beta1-php8.3-apache`, `beta-6.5-php8.3-apache`, `beta-6-php8.3-apache`, `beta-php8.3-apache`, `beta-6.5-beta1-php8.3`, `beta-6.5-php8.3`, `beta-6-php8.3`, `beta-php8.3`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.3/apache/Dockerfile) +- [`beta-6.5-beta1-php8.3-fpm`, `beta-6.5-php8.3-fpm`, `beta-6-php8.3-fpm`, `beta-php8.3-fpm`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.3/fpm/Dockerfile) +- [`beta-6.5-beta1-php8.3-fpm-alpine`, `beta-6.5-php8.3-fpm-alpine`, `beta-6-php8.3-fpm-alpine`, `beta-php8.3-fpm-alpine`](https://github.com/docker-library/wordpress/blob/637184f975302b2550d0b99f24373c31c37de03b/beta/php8.3/fpm-alpine/Dockerfile) # Quick reference (cont.)