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

Commits on Feb 22, 2015

  1. add Dockerfile & short guide

    @natebrennand
    natebrennand committed Feb 22, 2015
    Configuration menu
    Copy the full SHA
    8469874 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. switch to gunicorn & update requirements

    @natebrennand
    natebrennand committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    fbc9a49 View commit details
    Browse the repository at this point in the history

  2. upgrade vagrant box to ubuntu 14.04

    @natebrennand
    natebrennand committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    f71da84 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

  1. add instructions and install/run scripts for Consul

    @natebrennand
    natebrennand committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    b780c80 View commit details
    Browse the repository at this point in the history

  2. revamp configuration

    @natebrennand
    natebrennand committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    5eaf457 View commit details
    Browse the repository at this point in the history

  3. clean up requirements.txt

    @natebrennand
    natebrennand committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    cdd943f View commit details
    Browse the repository at this point in the history

  4. pep8 compliance

    @natebrennand
    natebrennand committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    b282e29 View commit details
    Browse the repository at this point in the history

  5. style changes to appease @danrschlosser

    @natebrennand
    natebrennand committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    8321fcf View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2015

  1. more descriptive configuration

    @natebrennand
    natebrennand committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    8cd43b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. update docs & gunicorn command

    @natebrennand @thebrianzeng
    natebrennand authored and thebrianzeng committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    c3dc1fc View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2015

  1. Merge branch 'master' into docker 

    Conflicts:
	density/config/flask_config.py
	density/density.py
    @thebrianzeng
    thebrianzeng committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    49e72e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into docker

    @thebrianzeng
    thebrianzeng committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    85f2224 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. option to use env variables or consul

    @thebrianzeng
    thebrianzeng committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    17b74be View commit details
    Browse the repository at this point in the history

  2. add script to setup consul for dev environment

    @thebrianzeng
    thebrianzeng committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    69c0260 View commit details
    Browse the repository at this point in the history

  3. source config/settings.dev in travis build 

    if USE_ENV_VARS isn't set to "TRUE", it will attempt to use
Consul, which makes the build fail.
    @thebrianzeng
    thebrianzeng committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    5bf2f79 View commit details
    Browse the repository at this point in the history

  4. change requests version so that pip works

    @thebrianzeng
    thebrianzeng committed Apr 24, 2015
    1 Configuration menu
    Copy the full SHA
    556237e View commit details
    Browse the repository at this point in the history