Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

run: Add the possibility to load an env file #3278

Merged
merged 6 commits into from
May 15, 2020
Merged

run: Add the possibility to load an env file #3278

merged 6 commits into from
May 15, 2020

Conversation

elcore
Copy link
Collaborator

@elcore elcore commented Apr 18, 2020 •
edited
Loading

This PR adds the possibility to load an env file from the run command.

caddy run --envfile <path>

Credit: @SmilingNavern for implementing this code in Caddy v1

@elcore elcore marked this pull request as draft April 18, 2020 23:52
@elcore elcore marked this pull request as ready for review April 18, 2020 23:55
francislavoie
francislavoie previously approved these changes Apr 19, 2020
View reviewed changes
Copy link
Member

@francislavoie francislavoie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woohoo! Thanks!

@francislavoie
Copy link
Member

francislavoie commented Apr 19, 2020 •
edited
Loading

Fixes #3009

@francislavoie francislavoie added this to the 2.1 milestone Apr 19, 2020
@francislavoie francislavoie linked an issue Apr 19, 2020 that may be closed by this pull request
v2: Support for .env files #3009
Closed
@mholt mholt added the under review 🧐 Review is pending before merging label Apr 19, 2020
@francislavoie francislavoie mentioned this pull request Apr 29, 2020
Merged
@francislavoie francislavoie requested a review from mholt May 13, 2020 02:38
mholt
mholt requested changes May 14, 2020
View reviewed changes
Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elcore This looks pretty good! Thanks!

Can you fix the merge conflict too and then we can get this wrapped up.

cmd/main.go Outdated Show resolved Hide resolved
cmd/main.go Outdated Show resolved Hide resolved
cmd/main.go Outdated Show resolved Hide resolved
@elcore @mholt
Apply suggestions from code review
5378e55 
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
@elcore elcore requested review from mholt and francislavoie May 15, 2020 18:00
@elcore
Copy link
Collaborator Author

elcore commented May 15, 2020

elcore dismissed francislavoie’s stale review via a78e45a 9 minutes ago

No idea what I have done to dismiss the review... I have just resolved the merge conflict...

@mholt
Copy link
Member

mholt commented May 15, 2020

It's automatic; we require any changes going into master to be reviewed. Thanks @elcore !

@mholt mholt removed the under review 🧐 Review is pending before merging label May 15, 2020
@mholt mholt merged commit 62c9f2c into caddyserver:master May 15, 2020
@elcore
Copy link
Collaborator Author

elcore commented May 15, 2020 •
edited
Loading

we require any changes going into master to be reviewed

I know 😊

Thanks @elcore !

You're welcome @mholt

@elcore elcore deleted the runenvfile branch May 15, 2020 22:26
@jesse996
Copy link
Contributor

could you add envfile in caddy start ?

@mholt
Copy link
Member

mholt commented Apr 30, 2021

@jesse996 Probably -- a bit busy right now, but PRs welcome, should be pretty easy!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mholt mholt mholt approved these changes

@francislavoie francislavoie Awaiting requested review from francislavoie

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.1.0
Development

Successfully merging this pull request may close these issues.

v2: Support for .env files
4 participants
@elcore @francislavoie @mholt @jesse996