Update docs release script so we can have autodeploys #10006
Conversation
|
@SvenDowideit @tianon I want/need this now for autodeploy of docs :D |
jessfraz
force-pushed
the
docs-release-fixes
branch
2 times, most recently
from
6d436e9
to
12a86e5
Compare
|
Ugg LGTM lol |
|
omg really on the first try :D I was so careful w tabs 🎉 |
|
i am going to bask in this glory all day |
| @@ -83,7 +83,7 @@ build: bundles | |||
| docker build -t "$(DOCKER_IMAGE)" . | |||
|
|
|||
| docs-build: | |||
| git diff --name-status upstream/release..upstream/docs docs/ > docs/changed-files | |||
| ( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs docs/ > docs/changed-files | |||
There was a problem hiding this comment.
mmm, I was thinking to change this to detecting what the user had aliased the github.com/docker/docker repo to
|
meh. LGTM, or you can make it even more awesome :D |
|
hmmm hard to do that in one line on the makefile but I was planning on a cleanup PR after this :) i saw a few other thing hehe |
|
sweet :) |
| @@ -78,6 +78,11 @@ upload_current_documentation() { | |||
| src=site/ | |||
| dst=s3://$BUCKET$1 | |||
|
|
|||
| cache="max-age=3600" | |||
| if [ ! -z "$NOCACHE" ]; then | |||
There was a problem hiding this comment.
Wait, what's this [ ! -z ... ] nonsense? Why not just [ "$NOCACHE" ]?
There was a problem hiding this comment.
dammmmiiitttttt I was so close to being perfect
There was a problem hiding this comment.
Also, you have some unnecessary interpolation in this same file's changes that I'll leave as an exercise for you to figure out where is at. 😉
There was a problem hiding this comment.
cache="max-age=3600"
and
cache="no-cache"
jessfraz
force-pushed
the
docs-release-fixes
branch
from
12a86e5
to
e838752
Compare
| @@ -158,4 +163,4 @@ sed -i "s/^site_url:.*/site_url: \/$MAJOR_MINOR\//" mkdocs.yml | |||
| echo "Building the /$MAJOR_MINOR/ documentation" | |||
| build_current_documentation | |||
| upload_current_documentation "/$MAJOR_MINOR/" | |||
| invalidate_cache "/$MAJOR_MINOR" | |||
| [ "$NOCACHE" ] || invalidate_cache "/$MAJOR_MINOR" | |||
There was a problem hiding this comment.
it's funny bc i did that here and forgot to fix the other, next time im shooting for 100% awesomeness
|
is anything missing for this... I need this so my auto deploy script stops failing :P |
| @@ -78,6 +78,11 @@ upload_current_documentation() { | |||
| src=site/ | |||
| dst=s3://$BUCKET$1 | |||
|
|
|||
| cache="max-age=3600" | |||
| if [ "$NOCACHE" ]; then | |||
| cache="no-cache" | |||
There was a problem hiding this comment.
If you want me to review with my super pedantic hat on, this (and the one two lines above) are the ones I was referring to where double quotes aren't actually necessary. 👍
There was a problem hiding this comment.
(and if this were in project/ or contrib/, these would definitely need fixing 😉)
There was a problem hiding this comment.
it actually needs them tho in the shelling out later, I tried without and it doesn't set properly in aws script then :D
There was a problem hiding this comment.
let me try again tho
There was a problem hiding this comment.
nm that works, im going crazy, I was like but it should work.... ok updated lol
jessfraz
force-pushed
the
docs-release-fixes
branch
from
e838752
to
a6a748b
Compare
to docs.master.dockerproject.com. - Make the invaidation profile the bucket variable, not hard coded. - Add no cache variable for settings cache to "no-cache" Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
|
LGTM |
Update docs release script so we can have autodeploys
Update docs release script so we can have autodeploys (cherry picked from commit 1781fed) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com> (github: SvenDowideit)
to docs.master.dockerproject.com.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle jess@docker.com (github: jfrazelle)