From 3525f4346924a4a1975b263fbe7c9a21aeeb66f7 Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Wed, 6 Oct 2021 12:27:02 +0200
Subject: [PATCH 1/2] Limit branches/tags of container build

Limit branch
---
 .github/workflows/containers.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index f6351d06..fe2b078b 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -1,9 +1,11 @@
 name: Build and push containers
 
 on:
-  # Automatically triggered by a testing workflow passing
+  # Automatically triggered by a testing workflow passing, but this is only checked when it lands in the `master`/default branch
   workflow_run:
     workflows: ["ChangeDetection.io Test"]
+    branches: [master]
+    tags: ['0.*']
     types: [completed]
 
   # Or a new tagged release
@@ -24,6 +26,7 @@ jobs:
         echo c: ${{ github.event.workflow_run.conclusion }}
         echo r: ${{ github.event.workflow_run }}
         echo tname: "${{ github.event.release.tag_name }}"
+        echo headbranch: -${{ github.event.workflow_run.head_branch }}-
         set
 
   build-push-containers:

From 4d0bd58eb1cf60d079c7402ddbaff51b9ee82716 Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Wed, 6 Oct 2021 13:07:56 +0200
Subject: [PATCH 2/2] Prefer GHCR.io over DockerHub (#245)

* Prefer GHCR.io over DockerHub (DockerHub limits pulls)
---
 README.md          | 10 +++++-----
 docker-compose.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 45bf6cf5..a6f9f0ec 100644
--- a/README.md
+++ b/README.md
@@ -41,15 +41,15 @@ Run the python code on your own machine by cloning this repository, or with <a h
 
 ### Docker
 
-Check out our Docker hub page https://hub.docker.com/r/dgtlmoon/changedetection.io
+_Note:_ We also use GitHub's container repository, because DockerHub has limited pull/downloads.
 
-With Docker composer, just clone this repository and
+With Docker composer, just clone this repository and..
 ```bash
 $ docker-compose up -d
 ```
 Docker standalone
 ```bash
-$ docker run -d --restart always -p "127.0.0.1:5000:5000" -v datastore-volume:/datastore --name changedetection.io dgtlmoon/changedetection.io
+$ docker run -d --restart always -p "127.0.0.1:5000:5000" -v datastore-volume:/datastore --name changedetection.io ghcr.io/dgtlmoon/changedetection.io
 ```
 
 ### Python Pip
@@ -69,10 +69,10 @@ _Now with per-site configurable support for using a fast built in HTTP fetcher o
 
 ### Docker
 ```
-docker pull dgtlmoon/changedetection.io
+docker pull ghcr.io/dgtlmoon/changedetection.io
 docker kill $(docker ps -a|grep changedetection.io|awk '{print $1}')
 docker rm $(docker ps -a|grep changedetection.io|awk '{print $1}')
-docker run -d --restart always -p "127.0.0.1:5000:5000" -v datastore-volume:/datastore --name changedetection.io dgtlmoon/changedetection.io
+docker run -d --restart always -p "127.0.0.1:5000:5000" -v datastore-volume:/datastore --name changedetection.io ghcr.io/dgtlmoon/changedetection.io
 ```
 
 ### docker-compose
diff --git a/docker-compose.yml b/docker-compose.yml
index cfef69e1..d06de402 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     changedetection.io:
-      image: dgtlmoon/changedetection.io
+      image: ghcr.io/dgtlmoon/changedetection.io
       container_name: changedetection.io
       hostname: changedetection.io
       volumes: