Skip to content

Commit 38c8a6c

Browse files
author
LRubin
authored
Merge pull request docker#40 from sanscontext/api-2
More cloud API docs fixes
2 parents 51f0aa2 + 9039fe6 commit 38c8a6c

31 files changed

+20
-35
lines changed

_data/toc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ toc:
971971
title: The Docker Cloud CLI
972972
- path: /docker-cloud/docker-errors-faq/
973973
title: Known Issues in Docker Cloud
974-
- path: /apidocs/cloud-api-output/docker-cloud/
974+
- path: /apidocs/docker-cloud/
975975
title: API reference
976976
- path: /docker-cloud/release-notes/
977977
title: Release Notes

apidocs/cloud-api-source/Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ release: build
1414
docker rm -f $(CONTAINER_NAME) || true
1515
docker run --name $(CONTAINER_NAME) -it \
1616
dockercloud/api-docs middleman build
17-
docker cp $(CONTAINER_NAME):/app/build ../cloud-api-output/
18-
rm -r ../cloud-api-output/docker-cloud
19-
mv ../cloud-api-output/build ../cloud-api-output/docker-cloud
20-
cp ../cloud-api-output/docker-cloud/index.html ../cloud-api-output/layouts/single.html
17+
docker cp $(CONTAINER_NAME):/app/build ../
18+
rm -r ../docker-cloud
19+
mv ../build ../docker-cloud
20+
cp ../docker-cloud/index.html ../layouts/single.html
2121
# defuse text that looks like a go template
22-
grep -rl '{{' ../cloud-api-output/* | xargs sed -i~ "s/{{/{ {/g"
23-
rm ../cloud-api-output/docker-cloud/includes/node.html~
24-
rm ../cloud-api-output/docker-cloud/includes/stack.html~
25-
rm ../cloud-api-output/docker-cloud/index.html~
26-
rm ../cloud-api-output/layouts/single.html~
22+
# commenting out until we know that we're not using Hugo anywhere & can remove
23+
# grep -rl '{ {' ../docker-cloud/* | xargs sed -i~ "s/{ {/{ {/g"
24+
#rm source/includes/node.md~
25+
#rm source/includes/stack.md~
26+
#rm ../source/index.html~
27+
#rm ../source/layouts/single.html~
2728
docker rm $(CONTAINER_NAME)

apidocs/docker-cloud.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)