Compare commits

..

No commits in common. "main" and "make_foodsoft_work_again" have entirely different histories.

4 changed files with 20 additions and 30 deletions

View File

@ -3,12 +3,10 @@ kind: pipeline
name: deploy to swarm-test.autonomic.zone
steps:
- name: deployment
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
image: decentral1se/stack-ssh-deploy:latest
settings:
host: swarm-test.autonomic.zone
stack: foodsoft
networks:
- proxy
purge: true
generate_secrets: true
deploy_key:
@ -51,23 +49,16 @@ steps:
SMTP_SERVER_PORT: 2525
SMTP_USER_NAME: foodsoft
STACK_NAME: foodsoft
PRODUCTION_ENV_VERSION: v1
trigger:
branch:
- main
---
kind: pipeline
name: generate recipe catalogue
name: recipe release
steps:
- name: release a new version
image: plugins/downstream
image: thecoopcloud/drone-abra:latest
settings:
server: https://build.coopcloud.tech
token:
from_secret: drone_abra-bot_token
fork: true
repositories:
- coop-cloud/auto-recipes-catalogue-json
trigger:
event: tag
command: recipe foodsoft release
deploy_key:
from_secret: abra_bot_deploy_key

View File

@ -1,6 +1,6 @@
TYPE=foodsoft
DOMAIN=order.example.com
DOMAIN=order.example.org
#EXTRA_DOMAINS=', `www.order.example.com`'
LETS_ENCRYPT_ENV=production
COMPOSE_FILE="compose.yml"

View File

@ -3,10 +3,10 @@ version: "3.8"
services:
app:
image: viehlieb/foodsoft:2024-02-22
image: viehlieb/foodsoft:2022-04-07_2
cron:
image: viehlieb/foodsoft:2024-02-22
image: viehlieb/foodsoft:2022-04-07_2
worker:
image: viehlieb/foodsoft:2024-02-22
image: viehlieb/foodsoft:2022-04-07_2
smtp:
image: viehlieb/foodsoft:2024-02-22
image: viehlieb/foodsoft:2022-04-07_2

View File

@ -22,7 +22,6 @@ x-env: &env
FOODCOOP_USE_NICK:
FOODCOOP_LANGUAGE:
LOG_LEVEL:
MINIMUM_BALANCE:
MYSQL_DB:
MYSQL_HOST:
MYSQL_PORT:
@ -56,7 +55,7 @@ x-secrets: &secrets
services:
app:
image: foodcoops/foodsoft:4.8.0
image: foodcoops/foodsoft:4.7.1
networks:
- internal
- proxy
@ -82,10 +81,10 @@ services:
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3000"
- "coop-cloud.${STACK_NAME}.version=1.2.0+4.8.0"
- "coop-cloud.${STACK_NAME}.version=1.0.0+4.7.1"
cron:
image: foodcoops/foodsoft:4.8.0
image: foodcoops/foodsoft:4.7.1
secrets: *secrets
configs: *configs
entrypoint: *entrypoint
@ -96,7 +95,7 @@ services:
- internal
worker:
image: foodcoops/foodsoft:4.8.0
image: foodcoops/foodsoft:4.7.1
secrets: *secrets
configs: *configs
entrypoint: *entrypoint
@ -107,7 +106,7 @@ services:
- internal
smtp:
image: foodcoops/foodsoft:4.8.0
image: foodcoops/foodsoft:4.7.1
configs: *configs
entrypoint: *entrypoint
secrets: *secrets
@ -127,7 +126,7 @@ services:
- "traefik.tcp.services.foodsoft-smtp.loadbalancer.server.port=${SMTP_SERVER_PORT}"
db:
image: "mariadb:10.11"
image: "mariadb:10.6"
command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci"
environment:
MYSQL_USER: ${MYSQL_USER}
@ -144,9 +143,9 @@ services:
deploy:
labels:
backupbot.backup: "true"
backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" $${MYSQL_DATABASE} > /var/lib/mysql/backup.sql'
backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
backupbot.backup.path: "/var/lib/mysql/backup.sql"
backupbot.backup.pre-hook: 'mkdir -p /tmp/backup/ && mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" $${MYSQL_DATABASE} > /tmp/backup/backup.sql'
backupbot.backup.post-hook: "rm -rf /tmp/backup"
backupbot.backup.path: "/tmp/backup/"
cache:
image: "redis:6"
networks: