vikunja/vikunja
6
43
Fork 73
Code Issues 151 Pull Requests 17 Packages Releases 32 Activity

Added section to full-docker-example.md for Caddy v2. #595

Merged
konrad merged 3 commits from leggettc18/api:master into master 2020-06-22 04:48:02 +00:00
Conversation 2 Commits 3 Files Changed 1 +54
leggettc18 commented 2020-06-22 03:38:09 +00:00
Contributor
Copy Link

Description

I added a section to the full-docker-example docs for the Caddy v2 webserver, in case anyone gets stuck on it like I did.

Checklist

  • I added or improved tests
  • I pushed new or updated dependencies to the repo using go mod vendor
  • I added or improved docs for my feature
    • Swagger (including make do-the-swag)
    • Error codes
    • New config options
# Description I added a section to the full-docker-example docs for the Caddy v2 webserver, in case anyone gets stuck on it like I did. # Checklist * [ ] I added or improved tests * [ ] I pushed new or updated dependencies to the repo using `go mod vendor` * [x] I added or improved docs for my feature * [ ] Swagger (including `make do-the-swag`) * [ ] Error codes * [ ] New config options
leggettc18 added 1 commit 2020-06-22 03:38:12 +00:00
Added section to full-docker-example.md for Caddy v2.
Some checks failed
continuous-integration/drone/pr Build is failing
Details
2859c71253
konrad requested changes 2020-06-22 03:46:13 +00:00
konrad left a comment
Owner
Copy Link

Two small nits, looking good otherwise!

Two small nits, looking good otherwise!
docs/content/doc/setup/full-docker-example.md
@ -221,0 +260,4 @@
frontend:
image: vikunja/frontend
restart: unless-stopped
proxy:
konrad commented 2020-06-22 03:44:09 +00:00
Owner
Copy Link

I guess you would not need the nginx proxy when using caddy? Could you remove that?

I guess you would not need the nginx proxy when using caddy? Could you remove that?
leggettc18 marked this conversation as resolved
docs/content/doc/setup/full-docker-example.md Outdated
@ -221,0 +270,4 @@
- api
- frontend
restart: unless-stopped
caddy:
konrad commented 2020-06-22 03:44:59 +00:00
Owner
Copy Link

Please also add a depends_on section like the proxy has.

Please also add a `depends_on` section like the proxy has.
leggettc18 commented 2020-06-22 03:49:29 +00:00
Author
Contributor
Copy Link

Yup I copy pasted the proxy docker-compose because it ended up being exactly the same minus the proxy section which I just forgot to remove. Oops! Gimme a few minutes I'll get that cleaned up.

Yup I copy pasted the proxy docker-compose because it ended up being exactly the same minus the proxy section which I just forgot to remove. Oops! Gimme a few minutes I'll get that cleaned up.
leggettc18 added 1 commit 2020-06-22 03:52:07 +00:00
Fixed some leftovers from copy-paste.
All checks were successful
continuous-integration/drone/pr Build is passing
Details
c6980a390f
leggettc18 added 1 commit 2020-06-22 03:53:15 +00:00
Fixed one more leftover formatting oddity.
All checks were successful
continuous-integration/drone/pr Build is passing
Details
5b0628233d
leggettc18 commented 2020-06-22 03:54:08 +00:00
Author
Contributor
Copy Link

Ok those should be fixed now.

Ok those should be fixed now.
leggettc18 requested review from konrad 2020-06-22 04:07:34 +00:00
konrad approved these changes 2020-06-22 04:10:04 +00:00
konrad left a comment
Owner
Copy Link

Looks good now, I'll merge once ci passes.

Looks good now, I'll merge once ci passes.
konrad merged commit 8b030135de into master 2020-06-22 04:48:01 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
konrad
Labels
Clear labels   
dependencies

   
duplicate

This issue or pull request already exists

  
help wanted

Need some help

  
invalid

Something is wrong

  
kind/bug

Something is not working

  
kind/feature

New feature

  
needs reproduction

   
question

More information is needed

  
security

   
wontfix

This won't be fixed

No Label
dependencies
duplicate
help wanted
invalid
kind/bug
kind/feature
needs reproduction
question
security
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: vikunja/vikunja#595
No description provided.
Delete Branch "leggettc18/api:master"

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?