From 9690981991db4307cec120836c7e271605ef3df8 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Tue, 15 Jun 2021 13:01:18 +0000 Subject: [PATCH] Docs: combine "user manual" and "programming manual" into "learn dagger" Signed-off-by: Solomon Hykes --- docs/{user/user.md => learn/101-use.md} | 14 ++++++++++---- .../programming.md => learn/102-dev.md} | 5 ++--- .../kubernetes.md => learn/107-kubernetes.md} | 6 +++++- .../108-cloudformation.mdx} | 10 +++++++--- docs/{user => learn}/_category_.json | 2 +- docs/programming/_category_.json | 5 ----- docs/programming/guides/_category_.json | 5 ----- 7 files changed, 25 insertions(+), 22 deletions(-) rename docs/{user/user.md => learn/101-use.md} (79%) rename docs/{programming/programming.md => learn/102-dev.md} (99%) rename docs/{programming/guides/kubernetes.md => learn/107-kubernetes.md} (99%) rename docs/{programming/guides/cloudformation.mdx => learn/108-cloudformation.mdx} (97%) rename docs/{user => learn}/_category_.json (60%) delete mode 100644 docs/programming/_category_.json delete mode 100644 docs/programming/guides/_category_.json diff --git a/docs/user/user.md b/docs/learn/101-use.md similarity index 79% rename from docs/user/user.md rename to docs/learn/101-use.md index 8535d0be..cf691b5a 100644 --- a/docs/user/user.md +++ b/docs/learn/101-use.md @@ -1,12 +1,18 @@ --- -slug: /user +slug: /learn/101-basics --- -# User Manual +# Dagger 101: basic usage -In this part, you will learn how to deploy a simple [React](https://reactjs.org/) application. This is an introduction before you [learn how to program dagger](/programming). +In this guide, you will learn the basics of Dagger by interacting with a pre-configured environment. +Then you will move on to creating your own environment from scratch. -You will learn how to use the most common dagger commands. +Our pre-configured environment deploys a simple [React](https://en.wikipedia.org/wiki/React_(JavaScript_library)) +application to a special hosting environment created and managed by us, the Dagger team for the purpose of this tutorial. +This will allow you to deploy something "real" right away, without having to configure your own infrastructure first. + +In later guides, you will learn how to configure Dagger to deploy to your own infrastructure. And, for advanced users, +how to share access to your infrastructure in the same way that we are sharing access to ours now. ## Before we start diff --git a/docs/programming/programming.md b/docs/learn/102-dev.md similarity index 99% rename from docs/programming/programming.md rename to docs/learn/102-dev.md index 12432ba7..b38ca872 100644 --- a/docs/programming/programming.md +++ b/docs/learn/102-dev.md @@ -1,9 +1,8 @@ --- -sidebar_position: 1 -slug: /programming +slug: /learn/102-dev --- -# Dagger 102: learn to program Dagger +# Dagger 102: create your first environment ## Overview diff --git a/docs/programming/guides/kubernetes.md b/docs/learn/107-kubernetes.md similarity index 99% rename from docs/programming/guides/kubernetes.md rename to docs/learn/107-kubernetes.md index 04b3463f..60bdfbd7 100644 --- a/docs/programming/guides/kubernetes.md +++ b/docs/learn/107-kubernetes.md @@ -1,4 +1,8 @@ -# Kubernetes +--- +slug: /learn/107-kubernetes +--- + +# Dagger 107: deploy to Kubernetes This tutorial illustrates how to use dagger to build, push and deploy Docker images to Kubernetes. diff --git a/docs/programming/guides/cloudformation.mdx b/docs/learn/108-cloudformation.mdx similarity index 97% rename from docs/programming/guides/cloudformation.mdx rename to docs/learn/108-cloudformation.mdx index 5f3e163f..af9415fd 100644 --- a/docs/programming/guides/cloudformation.mdx +++ b/docs/learn/108-cloudformation.mdx @@ -1,8 +1,12 @@ -# Infra provisioning +--- +slug: /learn/108-cloudformation +--- -## Integrating with AWS Cloudformation +# Dagger 108: provision infrastructure on AWS -After deploying the app on a bucket provisioned from the web interface, let's see how Dagger can be leveraged to extend our deployment pipeline using Cloudformation's relay. +In this guide you will learn how to automatically [provision infrastructure](https://dzone.com/articles/infrastructure-provisioning-–) on AWS, by integrating [Amazon Cloudformation](https://aws.amazon.com/cloudformation/) in your Dagger environment. + +We will start with something simple: provisioning a new bucket on [Amazon S3](https://en.wikipedia.org/wiki/Amazon_S3). But Cloudformation can provision almost any AWS resource; and Dagger can integrate with the full Cloudformation API. ## Prerequisites diff --git a/docs/user/_category_.json b/docs/learn/_category_.json similarity index 60% rename from docs/user/_category_.json rename to docs/learn/_category_.json index da5bd95a..3ac3d109 100644 --- a/docs/user/_category_.json +++ b/docs/learn/_category_.json @@ -1,5 +1,5 @@ { - "label": "User Manual", + "label": "Learn Dagger", "position": 3, "collapsed": false } diff --git a/docs/programming/_category_.json b/docs/programming/_category_.json deleted file mode 100644 index c8ba1504..00000000 --- a/docs/programming/_category_.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "label": "Programming Manual", - "position": 4, - "collapsed": false -} diff --git a/docs/programming/guides/_category_.json b/docs/programming/guides/_category_.json deleted file mode 100644 index c694eb5b..00000000 --- a/docs/programming/guides/_category_.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "label": "Guides", - "position": 2, - "collapsed": false -}