Skip to content

Commit

Permalink
linter + upd Copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
LeKovr committed Jan 28, 2021
1 parent dd15095 commit 6f3e9be
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<p align="center">
<span>English</span> |
<a href="README.ru.md#doposdcape">Pусский</a>
<a href="README.ru.md#readme">Pусский</a>
</p>

---

# dopos/dcape

> Docker-compose application environment
[![GitHub Release][1]][2]
Expand Down Expand Up @@ -33,7 +35,7 @@
For solving of above-mentioned tasks **dcape** uses docker-images of the following applications:

* **shared port** - [traefik](https://traefik.io/)
* **database** - [postgresql](https://www.postgresql.org)
* **database** - [postgresql](https://www.postgresql.org)
* **deploy applications remotely** - [drone](https://github.com/drone) (on every computer) and [gitea](https://gitea.io/) on someone
* **manage app configs** - [enfist](https://github.com/apisite/app-enfist)
* **limit access** - [narra](https://github.com/dopos/narra), [gitea](https://gitea.io/) organization used as user group
Expand All @@ -55,6 +57,7 @@ See [dopos.github.io/dcape](https://dopos.github.io/en/dcape)
### Deploy app local

Requirements:

* linux computer with docker and **dcape**
* hostnames registered in /etc/hosts or internal DNS (for example - `mysite.dev.lan`, `www.mysite.dev.lan`) pointing to this computer

Expand All @@ -74,6 +77,7 @@ That's all - `http://mysite.dev.lan/` and `http://www.mysite.dev.lan/` are worki
### Install dcape without gitea

Requirements:

* linux computer with docker and [dependensies](#Dependensies) installed
* DNS records for wildcard-domain `*.srv1.domain.tld`
* Gitea `$TOKEN` created
Expand Down Expand Up @@ -115,9 +119,8 @@ Creating dcape_enfist_1 ... done

That's all - server `srv1.domain.tld` ready for apps deployment, used **dcape** applications are accessible via `https://srv1.domain.tld`.


## License

The MIT License (MIT), see [LICENSE](LICENSE).

Copyright (c) 2017-2020 Aleksei Kovrizhkin <[email protected]>
Copyright (c) 2017-2021 Aleksei Kovrizhkin <[email protected]>
9 changes: 6 additions & 3 deletions README.ru.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<p align="center">
<a href="README.md#doposdcape">English</a> |
<a href="README.md#readme">English</a> |
<span>Pусский</span>
</p>

---

# dopos/dcape

> Среда управления docker-приложениями
[![GitHub Release][1]][2]
Expand Down Expand Up @@ -34,7 +35,7 @@
Для решения этих задач в **dcape** используются docker-образы следующих приложений:

* **общий порт** - [traefik](https://traefik.io/)
* **БД** - [postgresql](https://www.postgresql.org)
* **БД** - [postgresql](https://www.postgresql.org)
* **удаленно разворачивать приложения** - [drone](https://github.com/drone) (на каждом компьютере) и на каком-то одном - [gitea](https://gitea.io/) (или аналог)
* **управлять конфигурациями** - [enfist](https://github.com/apisite/app-enfist)
* **ограничивать доступ** - [narra](https://github.com/dopos/narra), в качестве группы пользователей используется организация [gitea](https://gitea.io/)
Expand All @@ -56,6 +57,7 @@
### Запуск приложения локально

Требования:

* компьютер с linux, docker и **dcape**
* зарегистрированные (в /etc/hosts или внутреннем DNS) имена для ip компьютера (например - `mysite.dev.lan`, `www.mysite.dev.lan`)

Expand All @@ -75,6 +77,7 @@ Creating mysite-dev-lan_www_1 ... done
### Установка dcape без gitea

Требования:

* компьютер с linux, docker и установленными [зависимостями](#зависимости)
* зарегистрированный в DNS для ip этого компьютера wildcard-домен (например - `*.srv1.domain.tld`)
* `$TOKEN` для gitea API
Expand Down Expand Up @@ -120,4 +123,4 @@ Creating dcape_enfist_1 ... done

The MIT License (MIT), see [LICENSE](LICENSE).

Copyright (c) 2017-2020 Алексей Коврижкин <[email protected]>
Copyright (c) 2017-2021 Алексей Коврижкин <[email protected]>

0 comments on commit 6f3e9be

Please sign in to comment.