From 13d6a8370f6970a3afbadf25662624995af2455b Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sun, 3 Apr 2022 23:53:50 +0100 Subject: [PATCH 1/2] docs: Correctly capitalize GitHub Signed-off-by: Issy Long --- docs/getting-started/1220-vs.md | 2 +- docs/introduction/1000-what_is.md | 2 +- docs/introduction/1002-vs.md | 2 +- docs/learn/1009-github-actions.md | 16 ++++++++-------- docs/learn/1011-package-manager.md | 2 +- docs/use-cases/1211-go-docker-swarm.md | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/getting-started/1220-vs.md b/docs/getting-started/1220-vs.md index 16b85f1a..f45e03ff 100644 --- a/docs/getting-started/1220-vs.md +++ b/docs/getting-started/1220-vs.md @@ -5,7 +5,7 @@ displayed_sidebar: europa # Dagger vs. Other Software -## Dagger vs. CI (Github Actions, Gitlab, CircleCI, Jenkins, etc.) +## Dagger vs. CI (GitHub Actions, Gitlab, CircleCI, Jenkins, etc.) Dagger does not replace your CI: it improves it by adding a portable development layer on top of it. diff --git a/docs/introduction/1000-what_is.md b/docs/introduction/1000-what_is.md index cade5632..c548ea26 100644 --- a/docs/introduction/1000-what_is.md +++ b/docs/introduction/1000-what_is.md @@ -9,7 +9,7 @@ Dagger is a portable devkit for CICD. It helps you develop powerful CICD pipelin * Choose from a wide catalog of reusable actions, or create your own in your favorite programming language. * Tie it all together with [CUE](https://cuelang.org), the next-generation declarative language invented at Google. No more YAML hell! * Unify dev and CI. The same Dagger pipeline can run on your dev machine or in CI. All you need is a Docker-compatible runtime. -* Avoid CI lock-in. Dagger runs natively on Github Actions, Gitlab, CircleCI, Jenkins, AWS Codebuild, Tekton, and more. +* Avoid CI lock-in. Dagger runs natively on GitHub Actions, Gitlab, CircleCI, Jenkins, AWS Codebuild, Tekton, and more. * Test and debug your pipelines locally; catch configuration errors in seconds with static type checking. Dagger_Website_Ship diff --git a/docs/introduction/1002-vs.md b/docs/introduction/1002-vs.md index 8cb7c9f1..715527a8 100644 --- a/docs/introduction/1002-vs.md +++ b/docs/introduction/1002-vs.md @@ -4,7 +4,7 @@ slug: /1002/vs/ # Dagger vs. Other Software -## Dagger vs. CI (Github Actions, Gitlab, CircleCI, Jenkins, etc.) +## Dagger vs. CI (GitHub Actions, Gitlab, CircleCI, Jenkins, etc.) Dagger does not replace your CI: it improves it by adding a portable development layer on top of it. diff --git a/docs/learn/1009-github-actions.md b/docs/learn/1009-github-actions.md index 5147f84c..ddc79de1 100644 --- a/docs/learn/1009-github-actions.md +++ b/docs/learn/1009-github-actions.md @@ -2,26 +2,26 @@ slug: /1009/github-actions/ --- -# Integrate Dagger with Github Actions +# Integrate Dagger with GitHub Actions -This tutorial illustrates how to use Github Actions and Dagger to build, push and deploy Docker images to Cloud Run. +This tutorial illustrates how to use GitHub Actions and Dagger to build, push and deploy Docker images to Cloud Run. ## Prerequisites We assume that you've finished our 106-cloudrun tutorial as this one continues right after. -## Setup new Github repo +## Setup new GitHub repo -Push existing `examples/todoapp` directory to your new Github repo (public or private). It should contain all the code +Push existing `examples/todoapp` directory to your new GitHub repo (public or private). It should contain all the code from `https://github.com/dagger/examples/tree/main/todoapp`, `gcpcloudrun` and `.dagger/env/gcpcloudrun/` directory. -### Add Github Actions Secret +### Add GitHub Actions Secret Dagger encrypts all input secrets using your key stored at `~/.config/dagger/keys.txt`. Copy the entire line starting -with `AGE-SECRET-KEY-` and save it to a Github secret named `DAGGER_AGE_KEY`. In case you don't know how to create -secrets on Github take a look at [this tutorial](https://docs.github.com/en/actions/reference/encrypted-secrets). +with `AGE-SECRET-KEY-` and save it to a GitHub secret named `DAGGER_AGE_KEY`. In case you don't know how to create +secrets on GitHub take a look at [this tutorial](https://docs.github.com/en/actions/reference/encrypted-secrets). -## Create a Github Actions Workflow +## Create a GitHub Actions Workflow Create `.github/workflows/gcpcloudrun.yml` file and paste the following code into it: diff --git a/docs/learn/1011-package-manager.md b/docs/learn/1011-package-manager.md index f0d41252..27f2b8f7 100644 --- a/docs/learn/1011-package-manager.md +++ b/docs/learn/1011-package-manager.md @@ -58,7 +58,7 @@ To install it just run dagger mod get github.com/dagger/packages/gcpcloudrun@v0.1 ``` -It should pull the `v0.1` version from Github, leave a copy in `cue.mod/pkg` and reflect the change in +It should pull the `v0.1` version from GitHub, leave a copy in `cue.mod/pkg` and reflect the change in `cue.mod/dagger.mod` file: ```shell diff --git a/docs/use-cases/1211-go-docker-swarm.md b/docs/use-cases/1211-go-docker-swarm.md index 8b971c91..4afe77e9 100644 --- a/docs/use-cases/1211-go-docker-swarm.md +++ b/docs/use-cases/1211-go-docker-swarm.md @@ -60,7 +60,7 @@ This is what the above looks like in the Dagger plan config: ``` -## Github Action integration +## GitHub Action integration This is the GitHub Actions workflow config that invokes `dagger`, which in turn runs the full plan: From ae52ad6011dbd839e9444258974a71cbcfe49718 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sun, 3 Apr 2022 23:54:34 +0100 Subject: [PATCH 2/2] docs: Correctly capitalize GitLab Signed-off-by: Issy Long --- docs/getting-started/1220-vs.md | 2 +- docs/introduction/1000-what_is.md | 2 +- docs/introduction/1002-vs.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/1220-vs.md b/docs/getting-started/1220-vs.md index f45e03ff..0439ba4d 100644 --- a/docs/getting-started/1220-vs.md +++ b/docs/getting-started/1220-vs.md @@ -5,7 +5,7 @@ displayed_sidebar: europa # Dagger vs. Other Software -## Dagger vs. CI (GitHub Actions, Gitlab, CircleCI, Jenkins, etc.) +## Dagger vs. CI (GitHub Actions, GitLab, CircleCI, Jenkins, etc.) Dagger does not replace your CI: it improves it by adding a portable development layer on top of it. diff --git a/docs/introduction/1000-what_is.md b/docs/introduction/1000-what_is.md index c548ea26..44f35cc5 100644 --- a/docs/introduction/1000-what_is.md +++ b/docs/introduction/1000-what_is.md @@ -9,7 +9,7 @@ Dagger is a portable devkit for CICD. It helps you develop powerful CICD pipelin * Choose from a wide catalog of reusable actions, or create your own in your favorite programming language. * Tie it all together with [CUE](https://cuelang.org), the next-generation declarative language invented at Google. No more YAML hell! * Unify dev and CI. The same Dagger pipeline can run on your dev machine or in CI. All you need is a Docker-compatible runtime. -* Avoid CI lock-in. Dagger runs natively on GitHub Actions, Gitlab, CircleCI, Jenkins, AWS Codebuild, Tekton, and more. +* Avoid CI lock-in. Dagger runs natively on GitHub Actions, GitLab, CircleCI, Jenkins, AWS Codebuild, Tekton, and more. * Test and debug your pipelines locally; catch configuration errors in seconds with static type checking. Dagger_Website_Ship diff --git a/docs/introduction/1002-vs.md b/docs/introduction/1002-vs.md index 715527a8..025462b6 100644 --- a/docs/introduction/1002-vs.md +++ b/docs/introduction/1002-vs.md @@ -4,7 +4,7 @@ slug: /1002/vs/ # Dagger vs. Other Software -## Dagger vs. CI (GitHub Actions, Gitlab, CircleCI, Jenkins, etc.) +## Dagger vs. CI (GitHub Actions, GitLab, CircleCI, Jenkins, etc.) Dagger does not replace your CI: it improves it by adding a portable development layer on top of it.