Skip to content
This repository was archived by the owner on Aug 26, 2022. It is now read-only.

Conversation

@jgmize
Copy link
Contributor

@jgmize jgmize commented Feb 3, 2017

@jgmize
Copy link
Contributor Author

jgmize commented Feb 3, 2017

Working with @metadave and @escattone on this, still some items to address

@jgmize jgmize requested a review from escattone February 3, 2017 22:00
// DEIS_PROFILE=virginia deis2 config:push -p .env-dist -a mdn-demo
// Creating config... ...o..Error: Unknown Error (409): {"detail":"jenkins changed nothing - release stopped"}
// make: *** [deis-config] Error 1
sh "KUBECONFIG=${env.KUBECONFIG} kubectl --namespace=${env.DEIS_APP} apply -f k8s/"
Copy link
Contributor

Choose a reason for hiding this comment

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

I could see this being a helm chart down the road, but great for now.

@codecov-io
Copy link

codecov-io commented Feb 8, 2017

Codecov Report

Merging #4121 into master will not change coverage.

@@           Coverage Diff           @@
##           master    #4121   +/-   ##
=======================================
  Coverage   86.21%   86.21%           
=======================================
  Files         144      144           
  Lines        8877     8877           
  Branches     1187     1187           
=======================================
  Hits         7653     7653           
+ Misses        990      988    -2     
- Partials      234      236    +2
Impacted Files Coverage Δ
kuma/wiki/admin.py 76.23% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9743cd8...5b35a3b. Read the comment docs.

@jgmize jgmize force-pushed the demo branch 2 times, most recently from aecadb7 to 9a1eac6 Compare February 8, 2017 22:26
Copy link
Contributor

@escattone escattone left a comment

Choose a reason for hiding this comment

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

I'd like to see this one change.

Makefile Outdated
requirements = -r requirements/local.txt
# set Django settings module if not already set as env var
export DJANGO_SETTINGS_MODULE ?= kuma.settings.testing
export DJANGO_SETTINGS_MODULE ?= kuma.settings.prod
Copy link
Contributor

@escattone escattone Feb 8, 2017

Choose a reason for hiding this comment

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

I think it's safest for the default value of the DJANGO_SETTINGS_MODULE to remain at kuma.settings.testing for now, since this Makefile is used in multiple contexts that we'll need to sort out (like tox.ini which is used by Travis via .travis.yml). Instead, can we find another way to set DJANGO_SETTINGS_MODULE=kuma.settings.prod before the make build-static in the Dockerfile?

@escattone escattone force-pushed the demo branch 2 times, most recently from 768a0af to 097b63d Compare February 9, 2017 00:47
@escattone
Copy link
Contributor

escattone commented Feb 9, 2017

It seems that this commit addresses my concern of not (yet) messing with the DJANGO_SETTINGS_MODULE setting in the Makefile, while still ensuring we use the production settings when building the Kuma Docker image (for the make build-static step).

The goal is to avoid (for now) addressing the consequences in other contexts that we'll need to sort out (like tox.ini which is used by Travis via .travis.yml).

I'd love to have @jwhitlock take a look at this as well to get his thoughts before I merge.

@escattone
Copy link
Contributor

Actually, I had an idea overnight that would be better, let me try that before any further review.

@escattone escattone force-pushed the demo branch 2 times, most recently from 50bbe9c to 3b890c7 Compare February 9, 2017 17:01
@escattone
Copy link
Contributor

My idea didn't work, as it was based on the Dockerfile picking up the DJANGO_SETTINGS_MODULE setting from its environment (in this case, the demo.groovy file), which it doesn't. Never mind. This is good to go.

@escattone escattone merged commit 302819a into master Feb 9, 2017
@jwhitlock jwhitlock deleted the demo branch September 21, 2017 13:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants