From 55be806bd7bc1541608286d9ec289eec4ee35d82 Mon Sep 17 00:00:00 2001 From: LRubin Date: Tue, 4 Oct 2016 15:53:07 -0700 Subject: [PATCH] check in apidocs move Signed-off-by: LRubin --- apidocs/cloud-api-source/Makefile | 19 +++++++++--------- .../docker-cloud/fonts/slate.eot | Bin .../docker-cloud/fonts/slate.svg | 0 .../docker-cloud/fonts/slate.ttf | Bin .../docker-cloud/fonts/slate.woff | Bin .../docker-cloud/fonts/slate.woff2 | Bin .../docker-cloud/images/logo.png | Bin .../docker-cloud/images/navbar.png | Bin .../docker-cloud/includes/action.html | 0 .../includes/availabilityzone.html | 0 .../docker-cloud/includes/container.html | 0 .../includes/dockercloud-events.html | 0 .../docker-cloud/includes/node.html | 0 .../docker-cloud/includes/nodecluster.html | 0 .../docker-cloud/includes/nodetype.html | 0 .../docker-cloud/includes/provider.html | 0 .../docker-cloud/includes/region.html | 0 .../docker-cloud/includes/registry.html | 0 .../docker-cloud/includes/repository.html | 0 .../docker-cloud/includes/service.html | 0 .../docker-cloud/includes/stack.html | 0 .../docker-cloud/includes/tag.html | 0 .../docker-cloud/includes/triggers.html | 0 .../docker-cloud/index.html | 0 .../docker-cloud/javascripts/all.js | 0 .../docker-cloud/javascripts/all_nosearch.js | 0 .../docker-cloud/stylesheets/print.css | 0 .../docker-cloud/stylesheets/screen.css | 0 .../layouts/single.html | 0 29 files changed, 10 insertions(+), 9 deletions(-) rename apidocs/{cloud-api-output => }/docker-cloud/fonts/slate.eot (100%) rename apidocs/{cloud-api-output => }/docker-cloud/fonts/slate.svg (100%) rename apidocs/{cloud-api-output => }/docker-cloud/fonts/slate.ttf (100%) rename apidocs/{cloud-api-output => }/docker-cloud/fonts/slate.woff (100%) rename apidocs/{cloud-api-output => }/docker-cloud/fonts/slate.woff2 (100%) rename apidocs/{cloud-api-output => }/docker-cloud/images/logo.png (100%) rename apidocs/{cloud-api-output => }/docker-cloud/images/navbar.png (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/action.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/availabilityzone.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/container.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/dockercloud-events.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/node.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/nodecluster.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/nodetype.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/provider.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/region.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/registry.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/repository.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/service.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/stack.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/tag.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/includes/triggers.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/index.html (100%) rename apidocs/{cloud-api-output => }/docker-cloud/javascripts/all.js (100%) rename apidocs/{cloud-api-output => }/docker-cloud/javascripts/all_nosearch.js (100%) rename apidocs/{cloud-api-output => }/docker-cloud/stylesheets/print.css (100%) rename apidocs/{cloud-api-output => }/docker-cloud/stylesheets/screen.css (100%) rename apidocs/{cloud-api-output => }/layouts/single.html (100%) diff --git a/apidocs/cloud-api-source/Makefile b/apidocs/cloud-api-source/Makefile index b48b71bd94..b3119bb486 100644 --- a/apidocs/cloud-api-source/Makefile +++ b/apidocs/cloud-api-source/Makefile @@ -14,14 +14,15 @@ release: build docker rm -f $(CONTAINER_NAME) || true docker run --name $(CONTAINER_NAME) -it \ dockercloud/api-docs middleman build - docker cp $(CONTAINER_NAME):/app/build ../cloud-api-output/ - rm -r ../cloud-api-output/docker-cloud - mv ../cloud-api-output/build ../cloud-api-output/docker-cloud - cp ../cloud-api-output/docker-cloud/index.html ../cloud-api-output/layouts/single.html + docker cp $(CONTAINER_NAME):/app/build ../ + rm -r ../docker-cloud + mv ../build ../docker-cloud + cp ../docker-cloud/index.html ../layouts/single.html # defuse text that looks like a go template - grep -rl '{{' ../cloud-api-output/* | xargs sed -i~ "s/{{/{ {/g" - rm ../cloud-api-output/docker-cloud/includes/node.html~ - rm ../cloud-api-output/docker-cloud/includes/stack.html~ - rm ../cloud-api-output/docker-cloud/index.html~ - rm ../cloud-api-output/layouts/single.html~ + # commenting out until we know that we're not using Hugo anywhere & can remove +# grep -rl '{ {' ../docker-cloud/* | xargs sed -i~ "s/{ {/{ {/g" + #rm source/includes/node.md~ + #rm source/includes/stack.md~ + #rm ../source/index.html~ + #rm ../source/layouts/single.html~ docker rm $(CONTAINER_NAME) diff --git a/apidocs/cloud-api-output/docker-cloud/fonts/slate.eot b/apidocs/docker-cloud/fonts/slate.eot similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/fonts/slate.eot rename to apidocs/docker-cloud/fonts/slate.eot diff --git a/apidocs/cloud-api-output/docker-cloud/fonts/slate.svg b/apidocs/docker-cloud/fonts/slate.svg similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/fonts/slate.svg rename to apidocs/docker-cloud/fonts/slate.svg diff --git a/apidocs/cloud-api-output/docker-cloud/fonts/slate.ttf b/apidocs/docker-cloud/fonts/slate.ttf similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/fonts/slate.ttf rename to apidocs/docker-cloud/fonts/slate.ttf diff --git a/apidocs/cloud-api-output/docker-cloud/fonts/slate.woff b/apidocs/docker-cloud/fonts/slate.woff similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/fonts/slate.woff rename to apidocs/docker-cloud/fonts/slate.woff diff --git a/apidocs/cloud-api-output/docker-cloud/fonts/slate.woff2 b/apidocs/docker-cloud/fonts/slate.woff2 similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/fonts/slate.woff2 rename to apidocs/docker-cloud/fonts/slate.woff2 diff --git a/apidocs/cloud-api-output/docker-cloud/images/logo.png b/apidocs/docker-cloud/images/logo.png similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/images/logo.png rename to apidocs/docker-cloud/images/logo.png diff --git a/apidocs/cloud-api-output/docker-cloud/images/navbar.png b/apidocs/docker-cloud/images/navbar.png similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/images/navbar.png rename to apidocs/docker-cloud/images/navbar.png diff --git a/apidocs/cloud-api-output/docker-cloud/includes/action.html b/apidocs/docker-cloud/includes/action.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/action.html rename to apidocs/docker-cloud/includes/action.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/availabilityzone.html b/apidocs/docker-cloud/includes/availabilityzone.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/availabilityzone.html rename to apidocs/docker-cloud/includes/availabilityzone.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/container.html b/apidocs/docker-cloud/includes/container.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/container.html rename to apidocs/docker-cloud/includes/container.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/dockercloud-events.html b/apidocs/docker-cloud/includes/dockercloud-events.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/dockercloud-events.html rename to apidocs/docker-cloud/includes/dockercloud-events.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/node.html b/apidocs/docker-cloud/includes/node.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/node.html rename to apidocs/docker-cloud/includes/node.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/nodecluster.html b/apidocs/docker-cloud/includes/nodecluster.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/nodecluster.html rename to apidocs/docker-cloud/includes/nodecluster.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/nodetype.html b/apidocs/docker-cloud/includes/nodetype.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/nodetype.html rename to apidocs/docker-cloud/includes/nodetype.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/provider.html b/apidocs/docker-cloud/includes/provider.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/provider.html rename to apidocs/docker-cloud/includes/provider.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/region.html b/apidocs/docker-cloud/includes/region.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/region.html rename to apidocs/docker-cloud/includes/region.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/registry.html b/apidocs/docker-cloud/includes/registry.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/registry.html rename to apidocs/docker-cloud/includes/registry.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/repository.html b/apidocs/docker-cloud/includes/repository.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/repository.html rename to apidocs/docker-cloud/includes/repository.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/service.html b/apidocs/docker-cloud/includes/service.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/service.html rename to apidocs/docker-cloud/includes/service.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/stack.html b/apidocs/docker-cloud/includes/stack.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/stack.html rename to apidocs/docker-cloud/includes/stack.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/tag.html b/apidocs/docker-cloud/includes/tag.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/tag.html rename to apidocs/docker-cloud/includes/tag.html diff --git a/apidocs/cloud-api-output/docker-cloud/includes/triggers.html b/apidocs/docker-cloud/includes/triggers.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/includes/triggers.html rename to apidocs/docker-cloud/includes/triggers.html diff --git a/apidocs/cloud-api-output/docker-cloud/index.html b/apidocs/docker-cloud/index.html similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/index.html rename to apidocs/docker-cloud/index.html diff --git a/apidocs/cloud-api-output/docker-cloud/javascripts/all.js b/apidocs/docker-cloud/javascripts/all.js similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/javascripts/all.js rename to apidocs/docker-cloud/javascripts/all.js diff --git a/apidocs/cloud-api-output/docker-cloud/javascripts/all_nosearch.js b/apidocs/docker-cloud/javascripts/all_nosearch.js similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/javascripts/all_nosearch.js rename to apidocs/docker-cloud/javascripts/all_nosearch.js diff --git a/apidocs/cloud-api-output/docker-cloud/stylesheets/print.css b/apidocs/docker-cloud/stylesheets/print.css similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/stylesheets/print.css rename to apidocs/docker-cloud/stylesheets/print.css diff --git a/apidocs/cloud-api-output/docker-cloud/stylesheets/screen.css b/apidocs/docker-cloud/stylesheets/screen.css similarity index 100% rename from apidocs/cloud-api-output/docker-cloud/stylesheets/screen.css rename to apidocs/docker-cloud/stylesheets/screen.css diff --git a/apidocs/cloud-api-output/layouts/single.html b/apidocs/layouts/single.html similarity index 100% rename from apidocs/cloud-api-output/layouts/single.html rename to apidocs/layouts/single.html