-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Adds wagtail inventory to search wagtail pages based on the block type #818
Conversation
6cbfa50
to
d00c7cf
Compare
@SaptakS I've run through the
This eventually led me to the conclusion (and it's not really obvious at all from the output on circle CI) that the nginx container is not starting and the
I think what's happening here is that the wagtail inventory package has been added to the |
2f835cd
to
d5f177c
Compare
@chigby thanks for pointing that out. Made the fix. Hoping the CI passes now. |
Seems the CI is passing now. |
d5f177c
to
f82b0c7
Compare
f82b0c7
to
98c6e27
Compare
@msheiny this PR will require |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks great! I want to remove the configuration var for running block_inventory
as part of docker-compose up
in favor of always running it manually as documented. I also want to get @msheiny to weigh in on the best way to resolve my above question. Once those changes are made, this is ready to merge.
devops/docker/django-start.sh
Outdated
@@ -30,6 +30,9 @@ django_start() { | |||
if [ "${DJANGO_CREATEDEVDATA:-no}" == "yes" ]; then | |||
./manage.py createdevdata | |||
fi | |||
if [ "${DJANGO_CREATEINVENTORY:-no}" == "yes" ]; then | |||
./manage.py block_inventory | |||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmmm I'm not sure if I want to add this. I kind of already want to get rid of the CREATEDEVDATA
option here...
docker-compose.yaml
Outdated
@@ -47,6 +47,7 @@ services: | |||
- postgresql | |||
environment: | |||
DJANGO_CREATEDEVDATA: "${DJANGO_CREATEDEVDATA:-no}" | |||
DJANGO_CREATEINVENTORY: "${DJANGO_CREATEINVENTORY:-no}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See above
@@ -34,6 +34,7 @@ | |||
'live_revision', | |||
'search_image', | |||
'blog_posts', | |||
'page_blocks', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch! Super interesting how Wagtail inventory works.
prod-docker-compose.yaml
Outdated
@@ -35,6 +35,7 @@ services: | |||
DJANGO_ALLOWED_HOSTS: app | |||
DJANGO_COLLECT_STATIC: "yes" | |||
DJANGO_CREATEDEVDATA: "${DJANGO_CREATEDEVDATA:-no}" | |||
DJANGO_CREATEINVENTORY: "${DJANGO_CREATEINVENTORY:-no}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See above
Can you elaborate what you mean by
Looks like that
I see cfpb/wagtail-inventory#19 kinda echoes what you indicate. Looks like Here's what the author had to say here:
|
98c6e27
to
b3fc9e0
Compare
@harrislapiroff removed |
b3fc9e0
to
aa611b0
Compare
Fixes #817