From caef1464c56f16f810b8d4b80dcc51a714fbfa74 Mon Sep 17 00:00:00 2001
From: Robert Dailey <rcdailey@gmail.com>
Date: Sat, 30 Jul 2022 13:38:22 -0500
Subject: [PATCH] ci: Docker edge tag now includes Recyclarr master build

---
 .github/workflows/docker.yml | 6 ++++++
 CHANGELOG.md                 | 2 ++
 docker/docker-compose.yml    | 1 +
 wiki/Docker.md               | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 27c9ee26..af5d4fd3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -76,6 +76,11 @@ jobs:
             ${{ env.SEMVER }},pattern={{major}}.{{minor}}
             ${{ env.SEMVER }},pattern={{major}}
 
+      - name: Enable building from source
+        id: info
+        if: ${{ github.event.ref == 'refs/heads/master' }}
+        run: echo '::set-output name=build_from_branch::master'
+
       - name: Login to GHCR
         if: env.SHOULD_PUBLISH
         uses: docker/login-action@v2
@@ -93,6 +98,7 @@ jobs:
           build-args: |
             REPOSITORY=${{ github.repository }}
             ${{ env.VERSION && format('RELEASE_TAG={0}', env.VERSION) }}
+            BUILD_FROM_BRANCH=${{ steps.info.outputs.build_from_branch }}
           platforms: linux/arm/v7,linux/arm64,linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67846ca4..91ff8042 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Radarr: New `--list-custom-formats` CLI option for getting a flat list of all CFs in the guide in
   YAML format, ready to copy & paste.
+- Docker: New `edge` tag for experimental and potentially unstable builds on `master`. Includes both
+  the latest Docker and Recyclarr changes to allow users to try them out before an official release.
 
 ### Changed
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e12f64b6..d9c657d6 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       context: .
       args:
         - TARGETPLATFORM=linux/amd64
+        - BUILD_FROM_BRANCH=master
     init: true
     networks: [recyclarr]
     volumes:
diff --git a/wiki/Docker.md b/wiki/Docker.md
index 05584a28..940bd040 100644
--- a/wiki/Docker.md
+++ b/wiki/Docker.md
@@ -72,8 +72,8 @@ value *stability* the most,  you want the bottom row. If you value being on *the
 
 | Tag      | Description                                                             |
 | -------- | ----------------------------------------------------------------------- |
-| `edge`   | Docker-only changes that have not yet been released                     |
-| `latest` | Latest release, no matter what, including breaking changes              |
+| `edge`   | Docker and Recyclarr changes on `master`. **Potentially unstable!**     |
+| `latest` | Latest stable release, no matter what, including breaking changes       |
 | `2`      | Latest *feature* and *bugfix* release; manual update for major releases |
 | `2.1`    | Latest *bugfix* release; manual update if you want new features         |
 | `2.1.2`  | Exact release; no automatic updates                                     |