From dad038f23cd3eab63d37aaf3cd56ad5ebdca7a1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 31 Mar 2024 17:10:05 +0000 Subject: [PATCH] Update to 3 in STEP and README.md --- .github/steps/-step.txt | 2 +- README.md | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt index 0cfbf08..00750ed 100644 --- a/.github/steps/-step.txt +++ b/.github/steps/-step.txt @@ -1 +1 @@ -2 +3 diff --git a/README.md b/README.md index 4ea68f4..c589e81 100644 --- a/README.md +++ b/README.md @@ -14,25 +14,21 @@ _Use GitHub Actions to publish your project to a Docker image._ -## Step 2: Add a Dockerfile +## Step 3: Merge your changes -_You created a publishing workflow! :tada:_ +_Let's get publishing! :heart:_ -We will add a `Dockerfile` to the `cd` branch. The `Dockerfile` contains a set of instructions that get stored in a `Docker Image`. If you'd like, you can [learn more about Dockerfiles](https://docs.docker.com/engine/reference/builder/). +You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your changes! -### :keyboard: Activity: Add a Dockerfile +### :keyboard: Activity: Merge your changes -1. In the `cd` branch, create `Dockerfile` at the project root and include: - ```dockerfile - FROM nginx:1.24-alpine - COPY . /usr/share/nginx/html - ``` -1. Commit your changes. +1. Merge your changes from `cd` into `main`. If you created the pull request in step 1, just open that PR and click on **Merge pull request**. If you did not create the pull request earlier, you can do it now by following the instructions in step 1. +1. (optional) Delete the branch `cd`. 1. Wait about 20 seconds then refresh this page (the one you're following instructions from). [GitHub Actions](https://docs.github.com/en/actions) will automatically update to the next step.