Skip to content

Commit 6da5b56

Browse files
committed
Add requirements for Windows, Docker Desktop for Linux released
1 parent ed207a2 commit 6da5b56

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

docs/install/containers/index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ Although there are many container engine tools for developing, managing, and run
3636

3737
### System requirements
3838

39-
```{todo}
40-
Add system requirements
41-
```
39+
The system requirements include those required by Docker itself.
40+
41+
- [Linux](https://docs.docker.com/desktop/install/linux-install/)
42+
- [macOS](https://docs.docker.com/desktop/install/mac-install/)
43+
- [Windows](https://docs.docker.com/desktop/install/windows-install/)
44+
45+
Plone 6 itself requires memory and disk space in addition to those of Docker alone.
46+
See its {ref}`install-packages-hardware-requirements-label`.
4247

4348

4449
### Install Docker
4550

46-
Install [Docker](https://docs.docker.com/get-docker/) for your operating system.
51+
Install [Docker Desktop](https://docs.docker.com/get-docker/) for your operating system.
4752

4853
Docker Desktop includes all Docker tools.
49-
Both macOS and Windows use Docker Desktop.
50-
On some Linux distributions a beta version of Docker Desktop is available.
51-
If Docker Desktop is not available for your Linux distribution, you may still install Docker Engine and all of its tools.
52-
Consult [Get Docker](https://docs.docker.com/get-docker/) for details.
53-
5454
{term}`Docker Compose` is one of the Docker tools that will be used throughout this documentation.
5555

5656

docs/install/install-from-packages.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,20 @@ When you want full control over development or deployment, installing Plone from
1919

2020
## System requirements
2121

22+
Plone 6 has both hardware requirements and software pre-requisites.
23+
24+
25+
(install-packages-hardware-requirements-label)=
26+
27+
### Hardware requirements
28+
2229
The hardware requirements below give a rough estimate of the minimum hardware setup needed for a Plone server.
2330

2431
{term}`Add-on` products and caching solutions may increase RAM requirements.
2532

2633
A single Plone installation is able to run many Plone sites.
2734
You may host multiple Plone sites on the same server.
2835

29-
- Almost any modern operating system, including Linux, macOS, and Windows, but a UNIX-based operating system is recommended.
3036
- Minimum 256 MB RAM and 512 MB of swap space per Plone site is required.
3137
2 GB or more RAM per Plone site is recommended.
3238
- Minimum 512 MB hard disk space is required.
@@ -37,6 +43,15 @@ You may host multiple Plone sites on the same server.
3743

3844
### Pre-requisites for installation
3945

46+
- An operating system that runs all the pre-requisites.
47+
Most UNIX-based operating systems are supported, including many Linux distributions, macOS, or WSL on Windows.
48+
A UNIX-based operating system is recommended.
49+
50+
```{important}
51+
Windows alone is not recommended because it does not support {term}`GNU make`.
52+
If you get Plone to run on Windows alone, please feel free to document and share your process.
53+
```
54+
4055
- [Python](https://www.python.org/downloads/) 3.8, 3.9, or 3.10.
4156
- {term}`Cookiecutter`
4257
- {term}`nvm`

0 commit comments

Comments
 (0)