Skip to content

Commit

Permalink
Merge branch 'release/29.x'
Browse files Browse the repository at this point in the history
* release/29.x:
  No issue: Update system requirements and improve pointers to Docker-based deployment
  • Loading branch information
reckart committed Oct 4, 2023
2 parents 83241bd + ee73885 commit e428d2b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
[[sect_installation]]
= Installation


You can run {product-name} on any major platform supporting Java, i.e. Linux, macOS or Windows.
However, we do not provide explicit support for setting up a production-ready instance of each of these
platforms.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

= Install Java

NOTE: If you aim for a Docker-based deployment, it is useful for you to read the following sections to better understand
how the overall setup works. However, you will not have to install Java. If you use Docker Compose, you may also not have
to install a database. Refer to the <<sect_docker>> section instead.

You can install a Java 11 JDK using the following commands.

[source,bash]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@
| Java Runtime Environment
| version 11 or higher

| Apache Tomcat (or compatible)
| version 9.0 or higher (Servlet API 4.0.0)

| MariaDB Server (or compatible)
| version 10.5 or higher
|===

.Requirements for a Docker-based deployment
[cols="2*"]
|===
| Docker
| version 24 or higher (arm64 or amd64)
|===

NOTE: link:https://mariadb.org[MariaDB] is an open source drop-in replacement for link:https://www.mysql.com[MySQL]. So generally, you can also use MySQL instead of MariaDB. Also, as far as we know, we do not use any fancy features of MariaDB 10.5 and did in fact until recently always use MySQL 5. So you can probably also use an older version of MariaDB or MySQL... but why should you? Think of all the unfixed bugs and consider also upgrading your database if you do a fresh installation of {product-name} - or use <<admin_guide.adoc#sect_docker,Docker>>.

0 comments on commit e428d2b

Please sign in to comment.