Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8fc323d410 | ||
|
|
1378ef4330 | ||
|
|
018097c4d2 | ||
|
|
3a8164d3a1 | ||
|
|
d9e0da92a2 | ||
|
|
a9497fea18 | ||
|
|
7d837a3d45 | ||
|
|
3682400cb4 | ||
|
|
ba679b3e9c | ||
|
|
8966fd7126 | ||
|
|
b8f0677c1b | ||
|
|
4d433bd8ff | ||
|
|
c236531def | ||
|
|
341922a2df | ||
|
|
29534f28fb | ||
|
|
8434c5c914 | ||
|
|
441d2c0006 | ||
|
|
09bf4d54c5 | ||
|
|
5c4b99b407 | ||
|
|
cf34b50e44 | ||
|
|
cd4d4313a4 |
@@ -0,0 +1,32 @@
|
|||||||
|
# Hedgedoc Recipe Maintenance
|
||||||
|
|
||||||
|
All contributions should be made via a pull request. This is to ensure a
|
||||||
|
certain quality and consistency, that others can rely on.
|
||||||
|
|
||||||
|
## Maintainer Responsibilities
|
||||||
|
|
||||||
|
A recipe maintainer has the following responsibilities:
|
||||||
|
|
||||||
|
- Respond to pull requests / issues within two weeks
|
||||||
|
- Make image security updates within a week
|
||||||
|
- Make image major updates every three months
|
||||||
|
|
||||||
|
In order to fullfill these responsibilities a recipe maintainer:
|
||||||
|
|
||||||
|
- Has to watch the repository (to get notifications)
|
||||||
|
- Needs to make sure renovate is configured properly
|
||||||
|
|
||||||
|
## Pull Requests
|
||||||
|
|
||||||
|
A pull request can be merged if it is approved by at least one maintainer. For
|
||||||
|
pull requests opened by a maintainer they need to be approved by another
|
||||||
|
maintainer. Even though it is okay to merge a pull request with one approval, it
|
||||||
|
is always better if all maintainers looked at the pull request and approved it.
|
||||||
|
|
||||||
|
## Become a maintainer
|
||||||
|
|
||||||
|
Everyone can apply to be a recipe maintainer:
|
||||||
|
1. Watch the repository to always get updates
|
||||||
|
2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
|
||||||
|
3. Once the pull request gets merged you will be added to the [hedgedoc maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/hedgedoc-maintainers).
|
||||||
|
4. Join the room [#cc-|-hedgedoc-maintenance:matrix.org](#cc-|-hedgedoc-maintenance:matrix.org) and chat to other maintainers.
|
||||||
@@ -5,8 +5,9 @@
|
|||||||
[Hedgedoc][hedegedoc] using Coöp Cloud ♥
|
[Hedgedoc][hedegedoc] using Coöp Cloud ♥
|
||||||
|
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
|
* **Maintainer**: [@fauno](https://git.coopcloud.tech/fauno) , Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
|
||||||
* **Category**: Apps
|
* **Category**: Apps
|
||||||
* **Status**: 2, beta
|
* **Status**: 3
|
||||||
* **Image**: [`quay.io/hedgedoc/hedgedoc`](https://quay.io/hedgedoc/hedgedoc), 4, upstream
|
* **Image**: [`quay.io/hedgedoc/hedgedoc`](https://quay.io/hedgedoc/hedgedoc), 4, upstream
|
||||||
* **Healthcheck**: Yes
|
* **Healthcheck**: Yes
|
||||||
* **Backups**: Yes
|
* **Backups**: Yes
|
||||||
@@ -20,14 +21,14 @@
|
|||||||
1. Set up Docker Swarm and [`abra`][abra]
|
1. Set up Docker Swarm and [`abra`][abra]
|
||||||
2. Deploy [`coop-cloud/traefik`][compose-traefik]
|
2. Deploy [`coop-cloud/traefik`][compose-traefik]
|
||||||
3. `abra app new hedgedoc`
|
3. `abra app new hedgedoc`
|
||||||
4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
|
4. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to
|
||||||
your Docker swarm box
|
your Docker swarm box
|
||||||
5. `abra app deploy YOURAPPDOMAIN`
|
5. `abra app deploy YOURAPPDOMAIN`
|
||||||
6. Create initial user:
|
6. Create initial user:
|
||||||
```
|
|
||||||
abra app run YOURAPPDOMAIN app bash
|
```
|
||||||
. /docker-entrypoint.sh -e
|
abra app run YOURAPPDOMAIN app -- bin/manage_users --add admin@ema.il
|
||||||
bin/manage_users
|
```
|
||||||
|
|
||||||
[hedegedoc]: https://github.com/hedgedoc/hedgedoc
|
[hedegedoc]: https://github.com/hedgedoc/hedgedoc
|
||||||
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
db:
|
db:
|
||||||
image: pgautoupgrade/pgautoupgrade:16-alpine
|
image: pgautoupgrade/pgautoupgrade:17-alpine
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=codimd
|
- POSTGRES_USER=codimd
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: quay.io/hedgedoc/hedgedoc:1.10.7
|
image: quay.io/hedgedoc/hedgedoc:1.12.0
|
||||||
environment:
|
environment:
|
||||||
- CMD_USECDN=false
|
- CMD_USECDN=false
|
||||||
- CMD_URL_ADDPORT=false
|
- CMD_URL_ADDPORT=false
|
||||||
@@ -58,7 +58,7 @@ services:
|
|||||||
- "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.replacement=https://${DOMAIN}/$${2}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.replacement=https://${DOMAIN}/$${2}"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.permanent=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.permanent=true"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=3.0.9+1.10.7"
|
- "coop-cloud.${STACK_NAME}.version=3.2.0+1.12.0"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: 'nodejs -e "http.get(''http://localhost:3000'', (res) => { console.log(''status: '', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });"'
|
test: 'nodejs -e "http.get(''http://localhost:3000'', (res) => { console.log(''status: '', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });"'
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Important CVE fixes
|
||||||
+2
-1
@@ -2,5 +2,6 @@
|
|||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"extends": [
|
"extends": [
|
||||||
"config:base"
|
"config:base"
|
||||||
]
|
],
|
||||||
|
"reviewers": ["fauno","moritz","simon","carla"]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user