diff --git a/README.md b/README.md index 3714e16120..8fce8e01f6 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,29 @@ # EGroupware -| Branch | Status | Tools | Usage | -| ------ | ------ | ----- | ----- | -| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | Travis CI | runs unit-tests after each commit | -| 20.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=20.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png) scrutinizer](https://scrutinizer-ci.com/g/EGroupware/egroupware/) | runs static analysis on our codebase | -| 19.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=19.1)](https://travis-ci.org/EGroupware/egroupware) | BrowserStack | manual testing with unusual browser versions or platforms | -### Default and prefered installation method for EGroupware is via your package manager: +| Tools | Usage | +| ----- | ----- | +| Travis CI | runs unit-tests after each commit | +| [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png) scrutinizer](https://scrutinizer-ci.com/g/EGroupware/egroupware/) | runs static analysis on our codebase | +| BrowserStack | manual testing with unusual browser versions or platforms | - https://software.opensuse.org/download.html?project=server%3AeGroupWare&package=egroupware-epl +### Default and prefered installation method for EGroupware is via your Linux package manager: -### Installing EGroupware 20.1 via Docker: -EGroupware 20.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in [doc/docker](https://github.com/EGroupware/egroupware/tree/20.1/doc/docker) subdirectory. +* [Installation & Update instructions](https://github.com/EGroupware/egroupware/wiki/Installation-using-egroupware-docker-RPM-DEB-package) +* [Distribution specific instructions](https://github.com/EGroupware/egroupware/wiki/Distribution-specific-instructions) -### Installing EGroupware 19.1 via Docker: -EGroupware 19.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in [doc/docker](https://github.com/EGroupware/egroupware/tree/19.1/doc/docker) subdirectory. +> Every other method (including a developer installation by cloning the repo) is way more complicated AND does not include all features, as part's of EGroupware are running in different containers, eg. the push-server! +### Installing EGroupware 21.1 via Docker for non-Linux environments or not supported Linux distros: +EGroupware 21.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in our [Wiki](https://github.com/EGroupware/egroupware/wiki/Docker-compose-installation) and in [doc/docker](https://github.com/EGroupware/egroupware/tree/21.1/doc/docker) subdirectory. -### Installing EGroupware development version: +### Installing EGroupware development version via Docker: +* this is the prefered developer installation, as it contains eg. a push-server container +* https://github.com/EGroupware/egroupware/tree/master/doc/docker/development + +### Deprecated EGroupware development installation: * install composer.phar from https://getcomposer.org/download/ -* optional: for minified JavaScript and CSS install nodejs and grunt +* for JavaScript dependencies and build install nodejs and npm +* optional: for minified CSS install grunt ``` apt/yum/zypper install nodejs npm install -g grunt-cli