Merge branch 'master' into ma/license

This commit is contained in:
Marko Anastasov
2020-05-18 15:01:38 +02:00
committed by GitHub

View File

@@ -1,6 +1,6 @@
# CI/CD with Docker and Kubernetes Book
![Semaphore build](https://semaphore.semaphoreci.com/badges/k8s-cicd-book.svg?key=703023bf-c686-4d4a-8538-07e2b1df3e97)
![Semaphore build](https://semaphore-oss.semaphoreci.com/badges/book-cicd-docker-kubernetes.svg)
## PDF creation
@@ -10,7 +10,7 @@ We're using official [Docker images of Pandoc][pandoc-docker].
You need to have Docker installed to build the PDF. See `Makefile`.
Semaphore automatically creates and uploads the PDF as an artifact from the
latest version of source text. See [k8s-cicd-book][semaphore-project] project.
latest version of source text. See [project on Semaphore][semaphore-project].
## Writing
@@ -18,12 +18,12 @@ Markdown source intentionally doesn't include new lines at 80 characters. This
is so that text is easy to paste and edit in editors like iA Writer and
Hemingway.
[pandoc]: https://pandoc.org
[pandoc-docker]: https://github.com/pandoc/dockerfiles
[semaphore-project]: https://semaphore.semaphoreci.com/projects/k8s-cicd-book
## Copyright & License
Copyright © 2020 Rendered Text.
<p xmlns:dct="http://purl.org/dc/terms/" xmlns:cc="http://creativecommons.org/ns#" class="license-text">This work is licensed under CC BY-NC-ND 4.0<a href="https://creativecommons.org/licenses/by-nc-nd/4.0"><img style="height:22px!important;margin-left: 3px;vertical-align:text-bottom;" src="https://search.creativecommons.org/static/img/cc_icon.svg" /><img style="height:22px!important;margin-left: 3px;vertical-align:text-bottom;" src="https://search.creativecommons.org/static/img/cc-by_icon.svg" /><img style="height:22px!important;margin-left: 3px;vertical-align:text-bottom;" src="https://search.creativecommons.org/static/img/cc-nc_icon.svg" /><img style="height:22px!important;margin-left: 3px;vertical-align:text-bottom;" src="https://search.creativecommons.org/static/img/cc-nd_icon.svg" /></a></p>
[pandoc]: https://pandoc.org
[pandoc-docker]: https://github.com/pandoc/dockerfiles
[semaphore-project]: https://semaphore-oss.semaphoreci.com/projects/book-cicd-docker-kubernetes