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

Docker and Consul support #158

Merged
merged 16 commits into from
May 1, 2015
Merged

Docker and Consul support #158

merged 16 commits into from
May 1, 2015

Conversation

thebrianzeng
Copy link
Contributor

@natebrennand

Modified @natebrennand's pull request.

@jzf2101
Copy link
Contributor

jzf2101 commented Apr 13, 2015

👍 when tests pass

@thebrianzeng
Merge branch 'master' into docker
49e72e8 
Conflicts:
	density/config/flask_config.py
	density/density.py
@thebrianzeng
Copy link
Contributor Author

@thenatebrennand how did you get your build for the encoder to pass? i keep getting density/config/flask_config.py:90:1: E402 module level import not at top of file density/density.py:16:1: E402 module level import not at top of file
and so on

@natebrennand
Copy link
Contributor

I'm guessing travis wasn't setup properly then. I would just move the import to the top.
Make sure you delete your editor file that's in the PR right now.

@thebrianzeng
Copy link
Contributor Author

@natebrennand any other comments before we merge this?

@thebrianzeng thebrianzeng reopened this Apr 24, 2015
@natebrennand
Copy link
Contributor

Should we switch it to trigger env vars on USE_ENV_VARS like in adi-website?

@thebrianzeng
Copy link
Contributor Author

added that functionality

On Fri, Apr 24, 2015 at 2:35 PM Nate notifications@github.com wrote:

Should we switch it to trigger env vars on USE_ENV_VARS like in
adi-website?

—
Reply to this email directly or view it on GitHub
#158 (comment).

@thebrianzeng
source config/settings.dev in travis build
5bf2f79 
if USE_ENV_VARS isn't set to "TRUE", it will attempt to use
Consul, which makes the build fail.
@jzf2101
Copy link
Contributor

jzf2101 commented Apr 25, 2015

Alternatively, we could build a hardcode solution to avoid @swbae31 's requests issue for now

thebrianzeng added a commit that referenced this pull request May 1, 2015
@thebrianzeng
Merge pull request #158 from thebrianzeng/docker
06a8d76 
Docker and Consul support
@thebrianzeng thebrianzeng merged commit 06a8d76 into ADI-Labs:master May 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thebrianzeng @jzf2101 @natebrennand