From a17d5c0ffe278bb44236e28e17930b938c46020e Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:49:22 -0400 Subject: [PATCH 1/6] Create 6-clean-up-docker.md --- .github/steps/6-clean-up-docker.md | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/steps/6-clean-up-docker.md diff --git a/.github/steps/6-clean-up-docker.md b/.github/steps/6-clean-up-docker.md new file mode 100644 index 0000000..3172bff --- /dev/null +++ b/.github/steps/6-clean-up-docker.md @@ -0,0 +1,31 @@ + + +## Step 6: Clean up Docker containers and images + +Excellent! Now it's time to clean up your Docker environment! 🧹 + +Let's stop the Docker container we have running and (optionally) remove the image. + +### :keyboard: Activity: Stop your container + +1. Find your running container by typing `docker ps`. +1. Use the following command to stop your container: + ```bash + docker stop CONTAINER_ID + ``` +1. Replace `CONTAINER_ID` with your image's Container ID. +1. Press **Enter**. + +### :keyboard: Activity: (optional) Remove your image + +1. List Docker images on your system by typing `docker image ls`. +1. Use the following command to remove your Docker image: + ```bash + docker rmi IMAGE_ID + ``` +1. (optional) For the sake of verification, you can re-run `docker image ls` to confirm your Docker image has been removed. +1. _We can't automatically verify this step for you, so please continue on to the next step below!_ From ab1558dafd10d4629b48a8a52222274261f0f7f0 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:50:18 -0400 Subject: [PATCH 2/6] Update 3-merge-your-pull-request.yml to add step 6 Add step 6 to workflow --- .github/workflows/3-merge-your-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/3-merge-your-pull-request.yml b/.github/workflows/3-merge-your-pull-request.yml index 381f5f4..2f7f1b1 100644 --- a/.github/workflows/3-merge-your-pull-request.yml +++ b/.github/workflows/3-merge-your-pull-request.yml @@ -55,7 +55,7 @@ jobs: fetch-depth: 0 # Let's get all the branches. # In README.md, switch step 3 for step 45X. - - name: Update to step 45X + - name: Update to step 456X uses: skills/action-update-step@v2 with: token: ${{ secrets.GITHUB_TOKEN }} From 35393529dfb2a66cd7dc6b4cdec5787e2e94ad85 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:51:11 -0400 Subject: [PATCH 3/6] Update 3-merge-your-pull-request.yml - update to_step Update the most important part of to_step! --- .github/workflows/3-merge-your-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/3-merge-your-pull-request.yml b/.github/workflows/3-merge-your-pull-request.yml index 2f7f1b1..88ceeea 100644 --- a/.github/workflows/3-merge-your-pull-request.yml +++ b/.github/workflows/3-merge-your-pull-request.yml @@ -60,5 +60,5 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} from_step: 3 - to_step: 45X + to_step: 456X branch_name: cd From c19384ef6105f0ae267d3e1edbe9a3bf61b8ac0b Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:56:20 -0400 Subject: [PATCH 4/6] Update 6-clean-up-docker.md - indent to continue the numbering Further indent to continue the ordered bullet numbering --- .github/steps/6-clean-up-docker.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/steps/6-clean-up-docker.md b/.github/steps/6-clean-up-docker.md index 3172bff..59eace8 100644 --- a/.github/steps/6-clean-up-docker.md +++ b/.github/steps/6-clean-up-docker.md @@ -6,17 +6,17 @@ ## Step 6: Clean up Docker containers and images -Excellent! Now it's time to clean up your Docker environment! 🧹 +Excellent! Now it's time to clean up your Docker environment! :broom: -Let's stop the Docker container we have running and (optionally) remove the image. +Let's stop :stop_sign: the Docker container we have running and (optionally) remove the image. :wastebasket: ### :keyboard: Activity: Stop your container 1. Find your running container by typing `docker ps`. 1. Use the following command to stop your container: - ```bash - docker stop CONTAINER_ID - ``` + ```bash + docker stop CONTAINER_ID + ``` 1. Replace `CONTAINER_ID` with your image's Container ID. 1. Press **Enter**. @@ -24,8 +24,8 @@ Let's stop the Docker container we have running and (optionally) remove the imag 1. List Docker images on your system by typing `docker image ls`. 1. Use the following command to remove your Docker image: - ```bash - docker rmi IMAGE_ID - ``` + ```bash + docker rmi IMAGE_ID + ``` 1. (optional) For the sake of verification, you can re-run `docker image ls` to confirm your Docker image has been removed. 1. _We can't automatically verify this step for you, so please continue on to the next step below!_ From 73ab9fb8cc04b550c94c6b0c8fa2fc47c6ae42f1 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:59:12 -0400 Subject: [PATCH 5/6] Update 6-clean-up-docker.md - singular words In the Step 6 heading, change containers and images to be singular. --- .github/steps/6-clean-up-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/steps/6-clean-up-docker.md b/.github/steps/6-clean-up-docker.md index 59eace8..5cfc61b 100644 --- a/.github/steps/6-clean-up-docker.md +++ b/.github/steps/6-clean-up-docker.md @@ -4,7 +4,7 @@ Define terms and link to docs.github.com. --> -## Step 6: Clean up Docker containers and images +## Step 6: Clean up Docker container and image Excellent! Now it's time to clean up your Docker environment! :broom: From c1fef121362bfea7134b19647a209237266eeee1 Mon Sep 17 00:00:00 2001 From: Michael Bear <38406045+mjbear@users.noreply.github.com> Date: Wed, 25 Sep 2024 09:19:52 -0400 Subject: [PATCH 6/6] Update 1-create-the-workflow-file.md - emphasize the cd branch text Use inline code tags like other steps in this course to emphasize the cd branch --- .github/steps/1-create-the-workflow-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/steps/1-create-the-workflow-file.md b/.github/steps/1-create-the-workflow-file.md index 0a8095e..48164bd 100644 --- a/.github/steps/1-create-the-workflow-file.md +++ b/.github/steps/1-create-the-workflow-file.md @@ -25,7 +25,7 @@ We'll start by creating the workflow file to publish a Docker image to GitHub Pa 1. Open a new browser tab, and work on the steps in your second tab while you read the instructions in this tab. 1. Navigate to the **Code** tab. -1. From the **main** branch dropdown, click on the **cd** branch. +1. From the **main** branch dropdown, click on the `cd` branch. 1. Navigate to the `.github/workflows/` folder, then select **Add file** and click on **Create new file**. 1. In the **Name your file...** field, enter `publish.yml`. 1. Add the following to the `publish.yml` file: