coop-cloud/loomio
1
0
Fork 1
Code Issues 7 Pull Requests 4 Projects Releases Wiki Activity

fix for OAUTH_ENABLED check #17

Merged
jmakdah2 merged 1 commits from patch_5.1.1_release into main 2025-08-03 22:55:55 +00:00
Conversation 2 Commits 1 Files Changed 3
+10 -4
jmakdah2 commented 2025-08-02 19:49:58 +00:00
Owner
Copy Link
Copy Source
No description provided.
jmakdah2 added 1 commit 2025-08-02 19:49:59 +00:00
fix for OAUTH_ENABLED check
continuous-integration/drone/pr Build is failing
Details
746413e31e
ammaratef45 approved these changes 2025-08-03 01:09:38 +00:00
decentral1se reviewed 2025-08-03 09:02:02 +00:00
entrypoint.sh
@@ -29,3 +29,1 @@
{{ if eq (env "OAUTH_ENABLED") "1" }}
file_env "OAUTH_APP_SECRET"
{{ end }}
if [ "$OAUTH_ENABLED" = "1" ]; then
decentral1se commented 2025-08-03 09:01:58 +00:00
Owner
Copy Link
Copy Source

Is there a reason you're not templating it? I would assume it would be better to stick to convention?

E.g.

peertube/compose.yml Lines 133 to 136 in 2744684292
app_entrypoint:
name: ${STACK_NAME}_app_entrypoint_${APP_ENTRYPOINT_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang

The .tmpl in https://git.coopcloud.tech/coop-cloud/peertube/src/branch/main/entrypoint.sh.tmpl

Another one of our weird recipe-isms 😂

Is there a reason you're not templating it? I would assume it would be better to stick to convention? E.g. https://git.coopcloud.tech/coop-cloud/peertube/src/commit/2744684292d66053a9681ac57692b9f026863dde/compose.yml#L133-L136 The `.tmpl` in https://git.coopcloud.tech/coop-cloud/peertube/src/branch/main/entrypoint.sh.tmpl Another one of our weird recipe-isms 😂
ammaratef45 commented 2025-08-03 22:16:44 +00:00
Owner
Copy Link
Copy Source

Is this as simple as changing the file name to be end with .tmpl btw? @decentral1se

Is this as simple as changing the file name to be end with .tmpl btw? @decentral1se
jmakdah2 commented 2025-08-03 22:17:59 +00:00
Author
Owner
Copy Link
Copy Source

No reason, I was just working off of whatever was already there in the loomio recipe and didn't realize the convention is to have a .tmpl file for the entrypoint.

What are the benefits of it being a .tmpl file? Would you be ok with updating to .tmpl format in a separate change?

No reason, I was just working off of whatever was already there in the loomio recipe and didn't realize the convention is to have a .tmpl file for the entrypoint. What are the benefits of it being a .tmpl file? Would you be ok with updating to .tmpl format in a separate change?
decentral1se commented 2025-08-03 22:37:12 +00:00
Owner
Copy Link
Copy Source

@ammaratef45 @jmakdah2 The advantage of the .tmpl file is that you can inject values into it via the template engine (e.g. the {{ if eq (env "OAUTH_ENABLED") "1" }} syntax works). The .tmpl file naming is just convention also, the main thing required is the compose.yml snippet i shared in #17 (comment) where you specify the template_driver. It's ultimately up to y'all. I also have no strong feelings on how changes are done in this PR or whatever, up to you!

@ammaratef45 @jmakdah2 The advantage of the `.tmpl` file is that you can inject values into it via the template engine (e.g. the `{{ if eq (env "OAUTH_ENABLED") "1" }}` syntax works). The `.tmpl` file naming is just convention also, the main thing required is the `compose.yml` snippet i shared in https://git.coopcloud.tech/coop-cloud/loomio/pulls/17#issuecomment-25428 where you specify the `template_driver`. It's ultimately up to y'all. I also have no strong feelings on how changes are done in this PR or whatever, up to you!
jmakdah2 commented 2025-08-03 22:54:55 +00:00
Author
Owner
Copy Link
Copy Source

thanks @decentral1se, I agree would be better to stick to convention, but it doesn't feel like this is impacting us much now so I can look into updating it with another change or separately after this PR!

thanks @decentral1se, I agree would be better to stick to convention, but it doesn't feel like this is impacting us much now so I can look into updating it with another change or separately after this PR!
👍 1
decentral1se marked this conversation as resolved
jmakdah2 merged commit a323593824 into main 2025-08-03 22:55:55 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
ammaratef45
decentral1se
Labels
Clear labels
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm appletalk arjan basebuilder BornDeleuze Brooke carla cas (Cassowary) codegod100 coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) flancian Frando iexos jade (Jade Ambrose) javielico (Javielico) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) marlon (marlon) mayel mirsal moosemower moritz nicksellen (Nick Sellen) notplants oxaliq (sorrel) p4u1 pau pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) PhiNatalie renovate-bot (Comrade Renovate Bot) ripclap rix rscmbbng sef (sef) simon sixsmith (Sixsmith) stevensting tobias trav (Trav Fryer) val (val (he/him)) vaznasty virtualboys wolcen (Chris Thompson) wykwit xynosis yksflip
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: coop-cloud/loomio#17