Clarify the purpose of separate Docker resources (#30568)
This commit is contained in:
parent
3c435f9ba0
commit
569b7d2f25
3 changed files with 9 additions and 1 deletions
|
@ -1,5 +1,8 @@
|
||||||
# syntax=docker/dockerfile:1.7
|
# syntax=docker/dockerfile:1.7
|
||||||
|
|
||||||
|
# This file is designed for production server deployment, not local development work
|
||||||
|
# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
|
||||||
|
|
||||||
# Please see https://docs.docker.com/engine/reference/builder for information about
|
# Please see https://docs.docker.com/engine/reference/builder for information about
|
||||||
# the extended buildx capabilities used in this file.
|
# the extended buildx capabilities used in this file.
|
||||||
# Make sure multiarch TARGETPLATFORM is available for interpolation
|
# Make sure multiarch TARGETPLATFORM is available for interpolation
|
||||||
|
|
|
@ -101,7 +101,9 @@ To set up **MacOS** for native development, complete the following steps:
|
||||||
|
|
||||||
### Docker
|
### Docker
|
||||||
|
|
||||||
For development with **Docker**, complete the following steps:
|
For production hosting and deployment with **Docker**, use the `Dockerfile` and
|
||||||
|
`docker-compose.yml` in the project root directory. To create a local
|
||||||
|
development environment with **Docker**, complete the following steps:
|
||||||
|
|
||||||
- Install Docker Desktop
|
- Install Docker Desktop
|
||||||
- Run `docker compose -f .devcontainer/docker-compose.yml up -d`
|
- Run `docker compose -f .devcontainer/docker-compose.yml up -d`
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# This file is designed for production server deployment, not local development work
|
||||||
|
# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
|
||||||
|
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
restart: always
|
restart: always
|
||||||
|
|
Loading…
Reference in a new issue