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.

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

Change to load the json.gz file #10344

Merged

Conversation

SvenDowideit
Copy link
Contributor

No description provided.

@SvenDowideit
Copy link
Contributor Author

follow on of @unclejack 's change.

@SvenDowideit
Copy link
Contributor Author

@fredlf @jamtur01 this makes a pretty massive difference to the docs site responsiveness. I'll update the 1.14 docs update PR once we merge this so we can get it out there asap.

There are a couple more refinements that I'll work on over the next week or so, as we're still running with async: false (I need to dive into the tipuesearch code and make it more async), and also need to fix up some kind of fallback / build for make docs, as searching there needs some help. but those are further refinements :) the gzip and moving the tipuesearch initialisation to later makes for a pretty huge improvement on my end already.

@mariusGundersen - can you confirm if http://dowideit-docs.s3-website-ap-southeast-2.amazonaws.com/ is better for your side of the world? I have not looked deeply enought into tipuesearch to get rid of the async: false - thats one of the next steps. (my test s3 isn't cloudfronted like the real docs, but should still be better)

@@ -88,7 +91,6 @@ upload_current_documentation() {
echo " to $dst"
echo
#s3cmd --recursive --follow-symlinks --preserve --acl-public sync "$src" "$dst"
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this too?

@jamtur01
Copy link
Contributor

LGTM

@@ -100,6 +102,9 @@ upload_current_documentation() {
echo "$run"
echo "======================="
$run

# Make sure the search_content.json.gz file has the right content-encoding
aws s3 cp --profile $BUCKET --cache-control "max-age=3600" --content-encoding="gzip" --acl public-read "site/search_content.json.gz" "$dst"
Copy link
Contributor

Choose a reason for hiding this comment

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

can you use the cache control variable so it will work for the master docs :D

unclejack and others added 4 commits January 27, 2015 09:57
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

Docker-DCO-1.1-Signed-off-by: unclejack <unclejacksons@gmail.com> (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
…_content when we have a search ?q= param

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
@SvenDowideit SvenDowideit force-pushed the pr_out_change_to_load_the_json_gz_file branch from 6c2bff3 to 60089ac Compare January 26, 2015 23:58
@fredlf
Copy link
Contributor

fredlf commented Jan 27, 2015

LGTM. Thanks for handling this, @SvenDowideit!

SvenDowideit added a commit that referenced this pull request Jan 27, 2015
…_json_gz_file

Change to load the json.gz file
@SvenDowideit SvenDowideit merged commit a79d363 into moby:master Jan 27, 2015
@SvenDowideit SvenDowideit deleted the pr_out_change_to_load_the_json_gz_file branch January 27, 2015 01:13
SvenDowideit added a commit to SvenDowideit/docker that referenced this pull request Jan 27, 2015
…_the_json_gz_file

Change to load the json.gz file
(cherry picked from commit a79d363)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@users.noreply.github.com> (github: SvenDowideit)
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.

None yet

5 participants