Skip to content

Simplify docker-composer setup - #121

Open
mik-laj wants to merge 1 commit into
KlubJagiellonski:masterfrom
mik-laj:simple-docker
Open

Simplify docker-composer setup#121
mik-laj wants to merge 1 commit into
KlubJagiellonski:masterfrom
mik-laj:simple-docker

Conversation

@mik-laj

@mik-laj mik-laj commented Jun 26, 2018

Copy link
Copy Markdown
Member

Hi,

Currently, the environment is recognized using the environment variable. However, it can be done more simply.

Regards,

Additions

Removals

Changes

Testing

Review

Preview this PR without the whitespace changes

Screenshots

Notes

Todos

Checklist

  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows the standards laid out in the contributing
  • Passes all existing automated tests
  • New functions include new tests
  • New functions are documented (with a description, list of inputs, and expected output)
  • Project documentation has been updated (including the CHANGELOG)

@rafalgawlik

Copy link
Copy Markdown
Contributor

👍

@kzuraw kzuraw left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Thanks for the PR but I believe docker-componse setup is ok right now - see comment.

Comment thread config/settings/local.py
INTERNAL_IPS = ['127.0.0.1', '10.0.2.2', ]

if os.environ.get('USE_DOCKER') == 'yes':
if os.path.isfile('/.dockerenv'):

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It can simplify this code a little bit but I'm worried that this feature is not documented in any way (officially) so it can easily change between docker versions. I would stick to the current solution.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants