From 2fa2fa0b3477a1b2be5314e9ec3c43a01cba34bf Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@linux.com>
Date: Sat, 30 Jan 2021 20:03:23 +0800
Subject: [PATCH] dist/containers: move Dockerfiles out of the root directory

---
 .github/workflows/publish-rolling.yml                        | 5 +++--
 .github/workflows/release.yml                                | 2 +-
 README.md                                                    | 2 +-
 .../containers/Dockerfile.release                            | 0
 .../containers/Dockerfile.rtorrent                           | 0
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename Dockerfile.release => distribution/containers/Dockerfile.release (100%)
 rename Dockerfile.rtorrent => distribution/containers/Dockerfile.rtorrent (100%)

diff --git a/.github/workflows/publish-rolling.yml b/.github/workflows/publish-rolling.yml
index f4ce995a..d8ae1937 100644
--- a/.github/workflows/publish-rolling.yml
+++ b/.github/workflows/publish-rolling.yml
@@ -77,7 +77,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile.release
+          file: ./distribution/containers/Dockerfile.release
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: jesec/flood:master
@@ -91,7 +91,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile.rtorrent
+          file: ./distribution/containers/Dockerfile.rtorrent
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
@@ -127,6 +127,7 @@ jobs:
 
       - name: Publish flood:master-dbg to Docker Hub
         uses: docker/build-push-action@v2
+        file: ./Dockerfile
         with:
           context: .
           file: ./Dockerfile
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index acd08bab..3cd4367d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -102,7 +102,7 @@ jobs:
         with:
           build-args: VERSION=${{ steps.parse_semver.outputs.FULL_VERSION }}
           context: .
-          file: ./Dockerfile.release
+          file: ./distribution/containers/Dockerfile.release
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
diff --git a/README.md b/README.md
index 758aa668..cd0ff38e 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ Note that you have to let Docker know which port should be exposed (e.g. `-p 300
 
 Don't forget to pay attention to `flood`'s arguments like `--port` and `--allowedpath`.
 
-Checkout [Dockerfile.rtorrent](https://github.com/jesec/flood/blob/master/Dockerfile.rtorrent) for a simple example of Flood-rTorrent Docker integration.
+Checkout [Run Flood (and torrent clients) in containers](https://github.com/jesec/flood/discussions/120) discussion.
 
 Filesystem parts in [Troubleshooting](https://github.com/jesec/flood#troubleshooting) are especially important for containers.
 
diff --git a/Dockerfile.release b/distribution/containers/Dockerfile.release
similarity index 100%
rename from Dockerfile.release
rename to distribution/containers/Dockerfile.release
diff --git a/Dockerfile.rtorrent b/distribution/containers/Dockerfile.rtorrent
similarity index 100%
rename from Dockerfile.rtorrent
rename to distribution/containers/Dockerfile.rtorrent