Skip to content

Commit

Permalink
Pull environment from mix if mix is available
Browse files Browse the repository at this point in the history
  • Loading branch information
keathley committed Jan 14, 2020
1 parent f35db48 commit 5dfbf53
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/vapor/providers/dotenv.ex
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ defmodule Vapor.Provider.Dotenv do
defstruct filename: nil, overwrite: false

defimpl Vapor.Provider do
@mix_env Mix.env()

def load(%{filename: nil, overwrite: overwrite}) do
files = [".env", ".env.#{@mix_env}", ".env.local", ".env.#{@mix_env}.local"]
# Get the environment from mix. If mix isn't available we assume we're in
# a prod release
env = if Code.ensure_loaded?(Mix), do: Mix.env(), else: "prod"
files = [".env", ".env.#{env}", ".env.local", ".env.#{env}.local"]

files
|> Enum.reduce(%{}, fn file, acc -> Map.merge(acc, load_file(file)) end)
Expand Down

0 comments on commit 5dfbf53

Please sign in to comment.