Merge branch 'develop' into feature/app-store
This commit is contained in:
commit
0d9a9c0ea2
3 changed files with 73 additions and 2 deletions
46
.all-contributorsrc
Normal file
46
.all-contributorsrc
Normal file
|
@ -0,0 +1,46 @@
|
|||
{
|
||||
"files": [
|
||||
"README.md"
|
||||
],
|
||||
"imageSize": 100,
|
||||
"commit": false,
|
||||
"contributors": [
|
||||
{
|
||||
"login": "meienberger",
|
||||
"name": "Nicolas Meienberger",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/47644445?v=4",
|
||||
"profile": "https://meienberger.dev/",
|
||||
"contributions": [
|
||||
"code",
|
||||
"infra",
|
||||
"test",
|
||||
"doc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "ArneNaessens",
|
||||
"name": "ArneNaessens",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/16622722?v=4",
|
||||
"profile": "https://github.com/ArneNaessens",
|
||||
"contributions": [
|
||||
"code",
|
||||
"test",
|
||||
"ideas",
|
||||
"community"
|
||||
]
|
||||
}
|
||||
],
|
||||
"types": {
|
||||
"community": {
|
||||
"symbol": "🗣",
|
||||
"description": "Active community involvement",
|
||||
"link": "[<%= symbol %>](<%= url %> \"<%= description %>\"),"
|
||||
}
|
||||
},
|
||||
"contributorsPerLine": 7,
|
||||
"projectName": "runtipi",
|
||||
"projectOwner": "meienberger",
|
||||
"repoType": "github",
|
||||
"repoHost": "https://github.com",
|
||||
"skipCi": true
|
||||
}
|
23
README.md
23
README.md
|
@ -1,4 +1,7 @@
|
|||
# ⛺️ Tipi — A personal homeserver for everyone
|
||||
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
||||
[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-)
|
||||
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
||||
[![License](https://img.shields.io/github/license/meienberger/runtipi)](https://github.com/meienberger/runtipi/blob/master/LICENSE)
|
||||
[![Version](https://img.shields.io/github/v/release/meienberger/runtipi?color=%235351FB&label=version)](https://github.com/meienberger/runtipi/releases)
|
||||
![Issues](https://img.shields.io/github/issues/meienberger/runtipi)
|
||||
|
@ -93,3 +96,23 @@ Tipi is licensed under the GNU General Public License v3.0. TL;DR — You may co
|
|||
- [Twitter](https://twitter.com/runtipi)
|
||||
- [Telegram](https://t.me/+72-y10MnLBw2ZGI0)
|
||||
- [Discord](https://discord.gg/Bu9qEPnHsc)
|
||||
|
||||
## Contributors ✨
|
||||
|
||||
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
|
||||
|
||||
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
|
||||
<!-- prettier-ignore-start -->
|
||||
<!-- markdownlint-disable -->
|
||||
<table>
|
||||
<tr>
|
||||
<td align="center"><a href="https://github.com/ArneNaessens"><img src="https://avatars.githubusercontent.com/u/16622722?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ArneNaessens</b></sub></a><br /><a href="https://github.com/meienberger/runtipi/commits?author=ArneNaessens" title="Code">💻</a></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
<!-- prettier-ignore-end -->
|
||||
|
||||
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
||||
|
||||
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
|
||||
|
|
|
@ -15,12 +15,14 @@ echo "======================================"
|
|||
echo
|
||||
|
||||
OS="$(cat /etc/[A-Za-z]*[_-][rv]e[lr]* | grep "^ID=" | cut -d= -f2 | uniq | tr '[:upper:]' '[:lower:]' | tr -d '"')"
|
||||
SUB_OS="$(cat /etc/[A-Za-z]*[_-][rv]e[lr]* | grep "^ID_LIKE=" | cut -d= -f2 | uniq | tr '[:upper:]' '[:lower:]' | tr -d '"')"
|
||||
|
||||
if ! command -v docker >/dev/null; then
|
||||
|
||||
if command -v docker >/dev/null; then
|
||||
echo "Docker is already installed"
|
||||
else
|
||||
echo "Installing Docker"
|
||||
if [[ "${OS}" == "debian" ]]; then
|
||||
if [[ "${OS}" == "debian" || "${SUB_OS}" == "debian" ]]; then
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y ca-certificates curl gnupg jq lsb-release
|
||||
sudo mkdir -p /etc/apt/keyrings
|
||||
|
|
Loading…
Reference in a new issue