From 4d0cc0afc2f969e1c483c0383675f9d0a1855304 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 18 Apr 2021 21:43:05 +0200
Subject: [PATCH 1/5] Using the v1 of the docker action

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4a1be2ff..97c0dad1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout submodules
         run: git submodule update --init --recursive
       - name: Push to GitHub Packages
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v1
         with:
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}

From 2dda9befec64189c780f37e6ed9cf3b0dc3c37dc Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 18 Apr 2021 22:13:38 +0200
Subject: [PATCH 2/5] Upgrading the docker CI

---
 .github/workflows/docker.yml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 97c0dad1..f252d9f0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,13 +8,28 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     steps:
       - uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1
         with:
-          username: ${{github.actor}}
+          submodules: recursive
+      - name: Docker meta
+        id: meta
+        uses: crazy-max/ghaction-docker-meta@v2
+        with:
+          images: ghcr.io/${{github.repository_owner}}/Kyoo
+          tags: type=sha,prefix=
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{github.repository_owner}}
           password: ${{secrets.GITHUB_TOKEN}}
-          registry: docker.pkg.github.com
-          repository: AnonymusRaccoon/Kyoo/kyoo
-          tag_with_sha: true
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{github.ref == 'refs/heads/master'}}
+          tags: ${{steps.meta.outputs.tags}}

From 44b728139ac795f7ffaa92e40b404922aa2a6e7f Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 18 Apr 2021 22:37:01 +0200
Subject: [PATCH 3/5] Update docker.yml

---
 .github/workflows/docker.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f252d9f0..a2f8d809 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,7 +15,9 @@ jobs:
         uses: crazy-max/ghaction-docker-meta@v2
         with:
           images: ghcr.io/${{github.repository_owner}}/Kyoo
-          tags: type=sha,prefix=
+          tags: |
+            type=ref
+            type=sha,prefix=
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

From 6c0910c880be6168e2b2b62dd2d54a377117aa05 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 18 Apr 2021 22:39:00 +0200
Subject: [PATCH 4/5] Update docker.yml

---
 .github/workflows/docker.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a2f8d809..55de4897 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,9 @@ jobs:
         with:
           images: ghcr.io/${{github.repository_owner}}/Kyoo
           tags: |
-            type=ref
+            type=ref,event=tag
+            type=ref,event=branch
+            type=ref,event=pr
             type=sha,prefix=
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -33,5 +35,5 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          push: ${{github.ref == 'refs/heads/master'}}
+          push: true
           tags: ${{steps.meta.outputs.tags}}

From eec0460bda8996aefbd5836021a1e21306dfd3b1 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 18 Apr 2021 23:10:39 +0200
Subject: [PATCH 5/5] Adding a docker section to the readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 71cb21e2..0e25cbd6 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ For arch based, debian based or rpm compatible distributions, a package is autom
  - [Debian](https://nightly.link/AnonymusRaccoon/Kyoo/workflows/release/master/kyoo_debian.zip)
  - [RPM](https://nightly.link/AnonymusRaccoon/Kyoo/workflows/release/master/kyoo_rpm.zip)
 
+A docker file is also available and an up-to-date docker image is available at: `ghcr.io/anonymusraccoon/kyoo:master`. An example docker-compose image is available at the root of the repository. You can customise it to feet your needs and use a prebuild image or you can build it from source. To do that, clone the repository with the `--recurse` flag and run `docker-compose up `.
+
 ## Repositories
 
 This is the main repository for Kyoo. Here, you will find all the server's code, the build process & the login page.