From 86ef692ca63fd3040c0666f0ce1b6d5114e6f4eb Mon Sep 17 00:00:00 2001 From: kawaiipunk <kawaiipunk@posteo.net> Date: Tue, 23 Feb 2021 16:50:32 +0000 Subject: [PATCH] Fixed some merge conflicts that I messed up --- docs/faq.md | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index 823d656..e1fd3f6 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -4,37 +4,17 @@ title: Frequently asked questions ## What is the Co-op Cloud? -<<<<<<< HEAD Co-op Cloud aims to make hosting free software applications simple for small providers. It uses the latest container technologies and innovations and configurations are shared into [the commons](https://en.wikipedia.org/wiki/Commons) for the benefit of all. The project is intended for small service providers such as tech co-operatives who are looking to standardise around an open, transparent and scalable infrastructure. -======= -The Co-op Cloud is a project which aims to make self-hosting free software applications simple! It's a project which fits in alongside others like [Cloudron](https://www.cloudron.io/), [Yunohost](https://yunohost.org/) and [Freedombone](https://freedombone.net/) and others but has its own specific focus. The project is intended for existing small service providers and cooperatives already involved in hosting work who are looking for alternatives. - -## Which technologies? - -The core technologies are free software and enjoy wide adoption across free -software developer communities. - -- [Containers](#why-containers) -- [Docker compose](#why-docker-compose) -- [Docker swarm](#why-docker-swarm) - -## Who packages your applications? ->>>>>>> a87bafda8ce37f7139aaf3f598ae91d77a28332e ## Who is behind the project? The project was started by workers at [Autonomic](https://autonomic.zone/) which is a [workers co-operative](https://en.wikipedia.org/wiki/Worker_cooperative) providing technologies and infrastructure to empower users to make a positive impact on the world. -<<<<<<< HEAD We use Co-op Cloud in production amongst other systems. -======= -## Why containers? ->>>>>>> a87bafda8ce37f7139aaf3f598ae91d77a28332e ## Why Co-op Cloud? -<<<<<<< HEAD #### 👍 - 👍 Thin "ease of use" layer on top of already standardised tooling - 👍 Extremely modular @@ -51,11 +31,6 @@ We use Co-op Cloud in production amongst other systems. - 👎 Requires command line knowledge to use - 👎 Currently x86 only -## What about `$alternative`? - -We have various technical critiques of other similar projects which are already -up-and-running in the ecosystem as they don't necessarily meet our needs as a small tech co-op. However, the Cooperative Cloud isn't meant to be a replacement for these others projects. Here is a short overview of the pros/cons we see and how that relates to our goals here. -======= ## Why Docker Compose? ## Why Docker Swarm? @@ -66,8 +41,8 @@ One of our core principles is to not re-invent the wheel. However, fitting needs ## What about `$alternative`? -We have our critiques of other similar projects which are already up-and-running in the ecosystem. However, the Co-op Cloud isn't meant to be a replacement for these projects. Here is a short overview of the pros/cons we see and how that relates to our goals here. ->>>>>>> a87bafda8ce37f7139aaf3f598ae91d77a28332e +We have various technical critiques of other similar projects which are already +up-and-running in the ecosystem as they don't necessarily meet our needs as a small tech co-op. However, the Cooperative Cloud isn't meant to be a replacement for these others projects. Here is a short overview of the pros/cons we see and how that relates to our goals here. ### Cloudron @@ -181,11 +156,5 @@ TODO. TODO. - ## What licensing model do you use? - -<<<<<<< HEAD -The Cooperative Cloud is and will always be available under [copyleft licenses](https://en.wikipedia.org/wiki/Copyleft). -======= -The Co-op Cloud will always be available under copyleft licenses. ->>>>>>> a87bafda8ce37f7139aaf3f598ae91d77a28332e +The Cooperative Cloud is and will always be available under [copyleft licenses](https://en.wikipedia.org/wiki/Copyleft). \ No newline at end of file