Merge branch 'main' into small-image

.github/workflows/merge-main-into-small-image.yml

@@ -0,0 +1,25 @@
+name: merge-main-into-small-image.yml
+on:
+  pull_request:
+    branches:
+      - main   
+    types:
+      - closed
+jobs:
+  merge-main-into-small-image:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    timeout-minutes: 3
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Merge with main
+      run: |
+        git config user.name github-actions
+        git config user.email [email protected]
+        git fetch
+        git checkout small-image
+        git merge main --no-ff --no-edit
+        git push origin small-image

MAINTAINERS.md

@@ -1,12 +1,24 @@
 # Maintaining the docker/welcome-to-docker Image
 
-The image is stored on Docker Hub at the `docker/welcome-to-docker` repo.
+This document is for maintainers of this repository.
 
-For the `latest` tag, we are using the `small-image` branch to make the first walkthrough user experience optimal. Any changes in `main` should be merged into `small-image` also.
+## Docker Hub Image
 
-To push a change to the welcome-to-docker Hub image:
-```
+The image is stored on Docker Hub in the [`docker/welcome-to-docker`](https://hub.docker.com/r/docker/welcome-to-docker) repository.
+
+For the `latest` tag, we are using the `small-image` branch to make the first walkthrough user experience optimal. Every commit to `main` will be automatically merged to `small-image` via GitHub Actions.
+
+## Deploying Changes
+
+We do not currently have automation for pushing the changes to the image repository, so this is a manual step. First, wait for `small-image` to have the changes merged in and then run the following to build and push:
+```bash
 git checkout small-image
 docker buildx create --name mybuilder --use --bootstrap # only if not created before
 docker buildx build --push --platform linux/amd64,linux/arm64 --tag docker/welcome-to-docker .
 ```
+
+Be sure to verify the changes. Run the following command and visit http://localhost:8088 to verify the changes were successfully deployed.
+
+```bash
+docker run --pull always -p 8088:80 docker/welcome-to-docker:latest
+```