coop-cloud/foodsoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some improvements #6

Merged
decentral1se merged 6 commits from make_foodsoft_work_again into main 2022-04-12 10:37:21 +00:00
Conversation 2 Commits 6 Files Changed 5 +45 -19
yksflip commented 2022-04-07 13:20:09 +00:00
Owner
Copy Link
  • remove default footer message, because abra can't parse it
  • new variables for nicks, locale
  • backupbot labels
  • remove "" from EMAIL_REPLY_DOMAIN as it builds invalid email syntax on an empty env
* remove default footer message, because abra can't parse it * new variables for nicks, locale * backupbot labels * remove "" from EMAIL_REPLY_DOMAIN as it builds invalid email syntax on an empty env
🎉 1
yksflip added 3 commits 2022-04-07 13:20:10 +00:00
add nick, locale env ; fix email sender a3e3713112
replace yml templating stuff 9b20538e7b 
afaik yml templating is no longer supported by abra?
not sure if there is a better way to reduce so much redundancy
add backupbot
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
c1bd006c62
decentral1se reviewed 2022-04-07 13:53:54 +00:00
decentral1se left a comment
Owner
Copy Link

Thanks so much for working on this! 🚀

Thanks so much for working on this! 🚀
compose.yml Outdated
@ -1,61 +1,60 @@
version: "3.8"
x-env: &env
decentral1se commented 2022-04-07 13:53:08 +00:00
Owner
Copy Link

Ah, wait a sec, I think abra can still deal with this it is just the weird !%21merge characters which somehow snuck into the config. I thought I resolved that in c5c0768b10 & 66b6992b0b? Without this admittedly not very nice YAML feature, the duplication of config is really getting too much, no?

Ah, wait a sec, I think `abra` can still deal with this it is just the weird `!%21merge` characters which somehow snuck into the config. I thought I resolved that in https://git.coopcloud.tech/coop-cloud/foodsoft/commit/c5c0768b10a274769c42672b49f45405fb0f72d0 & https://git.coopcloud.tech/coop-cloud/foodsoft/commit/66b6992b0b12fd4b64d686dca8870e07d91b281e? Without this admittedly not very nice YAML feature, the duplication of config is really getting too much, no?
yksflip commented 2022-04-07 14:11:30 +00:00
Author
Owner
Copy Link

okay, I'll give it another try :)

okay, I'll give it another try :)
yksflip commented 2022-04-07 14:21:48 +00:00
Author
Owner
Copy Link

nice, my eyes feel releaved!
a simple git fetch could have saved me some pain :D

nice, my eyes feel releaved! a simple git fetch could have saved me some pain :D
yksflip marked this conversation as resolved
compose.yml Outdated
@ -137,1 +204,3 @@
labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-']
labels:
backupbot.backup: "true"
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'
decentral1se commented 2022-04-07 13:53:31 +00:00
Owner
Copy Link

👏

👏
yksflip marked this conversation as resolved
yksflip added 1 commit 2022-04-07 14:18:29 +00:00
long live yml templates
Some checks failed
continuous-integration/drone/pr Build is failing
Details
continuous-integration/drone/push Build is failing
Details
42bdf49ba5
yksflip changed title from WIP: remove yml teplating and more to some improvements 2022-04-07 14:25:10 +00:00
yksflip added 1 commit 2022-04-07 15:18:37 +00:00
add group order invoice override
Some checks failed
continuous-integration/drone/pr Build is failing
Details
continuous-integration/drone/push Build is failing
Details
964610022b
decentral1se approved these changes 2022-04-07 16:13:19 +00:00
decentral1se left a comment
Owner
Copy Link

LGTM! There is just some conflicts listed below?

LGTM! There is just some conflicts listed below?
yksflip added 1 commit 2022-04-12 10:26:30 +00:00
merge
Some checks failed
continuous-integration/drone/pr Build is failing
Details
continuous-integration/drone/push Build is failing
Details
39fe337f38
decentral1se merged commit 3439069337 into main 2022-04-12 10:37:21 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
decentral1se
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
3wordchant aadil abra-bot ammaratef45 Apfelwurm appletalk arjan basebuilder Brooke carla cas codegod100 coopcloud cyrnel decentral1se fauno flancian Frando iexos jade javielico jmakdah2 joe-irving kawaiipunk knoflook kolaente lambdabundesverband linnealovespie marlon mayel mirsal moritz nicksellen notplants p4u1 pau pharaohgraphy renovate-bot ripclap rix rscmbbng sef simon sixsmith stevensting tobias trav val Viehlieb virtualboys wolcen wykwit xynosis yksflip
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: coop-cloud/foodsoft#6
No description provided.
Delete Branch "make_foodsoft_work_again"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?