Compare commits
7 Commits
1.2.0+15.0
...
main
Author | SHA1 | Date | |
---|---|---|---|
81dd82ba86
|
|||
ec767e3eea
|
|||
5b3506ff19
|
|||
909eab8458
|
|||
b60feecd68 | |||
3ad265ce56
|
|||
798e4ea45d
|
@ -10,7 +10,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
13
abra.sh
13
abra.sh
@ -4,13 +4,14 @@ fix-permissions() {
|
|||||||
echo "Try adding '--user root'"
|
echo "Try adding '--user root'"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ ! -d /app/uploads ]; then
|
|
||||||
echo "error: no uploads dir!"
|
echo "Fixing permissions"
|
||||||
echo "Make sure to run it on the 'app' service"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Fixing upload permissions"
|
|
||||||
echo "Making karrot the owner of uploads"
|
echo "Making karrot the owner of uploads"
|
||||||
chown -R karrot:karrot /app/uploads
|
chown -R karrot:karrot /app/uploads
|
||||||
|
|
||||||
|
echo "Making karrot the owner of plugins"
|
||||||
|
chown -R karrot:karrot /app/plugins
|
||||||
|
|
||||||
echo "Done"
|
echo "Done"
|
||||||
}
|
}
|
||||||
|
19
compose.yml
19
compose.yml
@ -2,7 +2,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: "codeberg.org/karrot/karrot-frontend:v15.0.0"
|
image: "codeberg.org/karrot/karrot-frontend:v16.2.0"
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
environment:
|
environment:
|
||||||
@ -35,7 +35,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: "codeberg.org/karrot/karrot-backend:v15.0.0"
|
image: "codeberg.org/karrot/karrot-backend:v16.2.0"
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -49,7 +49,9 @@ services:
|
|||||||
- livekit_api_secret
|
- livekit_api_secret
|
||||||
volumes:
|
volumes:
|
||||||
- "app_data:/app/uploads/"
|
- "app_data:/app/uploads/"
|
||||||
|
- "plugins_data:/app/plugins/"
|
||||||
environment:
|
environment:
|
||||||
|
- ADMIN_EMAILS
|
||||||
- CSRF_TRUSTED_ORIGINS
|
- CSRF_TRUSTED_ORIGINS
|
||||||
- DATABASE_CONN_MAX_AGE
|
- DATABASE_CONN_MAX_AGE
|
||||||
- DATABASE_HOST=db
|
- DATABASE_HOST=db
|
||||||
@ -72,6 +74,7 @@ services:
|
|||||||
- POSTAL_API_URL
|
- POSTAL_API_URL
|
||||||
- POSTAL_WEBHOOK_KEY
|
- POSTAL_WEBHOOK_KEY
|
||||||
- PROXY_DISCOURSE_URL
|
- PROXY_DISCOURSE_URL
|
||||||
|
- PLUGIN_DIR=/app/plugins/
|
||||||
- REDIS_DB=0
|
- REDIS_DB=0
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
- REDIS_PORT=6379
|
- REDIS_PORT=6379
|
||||||
@ -94,19 +97,19 @@ services:
|
|||||||
- MIGRATE=yes
|
- MIGRATE=yes
|
||||||
command: server
|
command: server
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8000/api/config/"]
|
test: ["CMD", "curl", "-f", "http://localhost:8000/api/settings/"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 45s
|
start_period: 45s
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=1.2.0+15.0.0"
|
- "coop-cloud.${STACK_NAME}.version=2.2.0+16.2.0"
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=true"
|
||||||
- "backupbot.backup.path=/app/uploads"
|
- "backupbot.backup.path=/app/uploads"
|
||||||
|
|
||||||
worker:
|
worker:
|
||||||
image: "codeberg.org/karrot/karrot-backend:v15.0.0"
|
image: "codeberg.org/karrot/karrot-backend:v16.2.0"
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
networks:
|
networks:
|
||||||
@ -117,7 +120,11 @@ services:
|
|||||||
- smtp_password
|
- smtp_password
|
||||||
- vapid_private_key
|
- vapid_private_key
|
||||||
- livekit_api_secret
|
- livekit_api_secret
|
||||||
|
volumes:
|
||||||
|
- "app_data:/app/uploads/"
|
||||||
|
- "plugins_data:/app/plugins/"
|
||||||
environment:
|
environment:
|
||||||
|
- ADMIN_EMAILS
|
||||||
- DATABASE_CONN_MAX_AGE
|
- DATABASE_CONN_MAX_AGE
|
||||||
- DATABASE_HOST=db
|
- DATABASE_HOST=db
|
||||||
- DATABASE_NAME=karrot
|
- DATABASE_NAME=karrot
|
||||||
@ -133,6 +140,7 @@ services:
|
|||||||
- POSTAL_API_KEY
|
- POSTAL_API_KEY
|
||||||
- POSTAL_API_URL
|
- POSTAL_API_URL
|
||||||
- POSTAL_WEBHOOK_KEY
|
- POSTAL_WEBHOOK_KEY
|
||||||
|
- PLUGIN_DIR=/app/plugins/
|
||||||
- REDIS_DB=0
|
- REDIS_DB=0
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
- REDIS_PORT=6379
|
- REDIS_PORT=6379
|
||||||
@ -210,6 +218,7 @@ secrets:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
app_data:
|
app_data:
|
||||||
|
plugins_data:
|
||||||
postgres_data:
|
postgres_data:
|
||||||
redis_data:
|
redis_data:
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user