From e32d88379753c1a5b979a56ea606cc3d8c398232 Mon Sep 17 00:00:00 2001
From: Kieran Eglin <kieran.eglin@gmail.com>
Date: Thu, 13 Jun 2024 15:35:22 -0700
Subject: [PATCH] Moved as many docker-related files as possible

---
 .github/workflows/docker_release.yml                  | 2 +-
 .github/workflows/lint_and_test.yml                   | 2 +-
 README.md                                             | 2 +-
 docker-compose.yml                                    | 4 ++--
 dev.Dockerfile => docker/dev.Dockerfile               | 2 +-
 docker-compose.ci.yml => docker/docker-compose.ci.yml | 2 +-
 docker-run.dev.sh => docker/docker-run.dev.sh         | 0
 selfhosted.Dockerfile => docker/selfhosted.Dockerfile | 0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename dev.Dockerfile => docker/dev.Dockerfile (98%)
 rename docker-compose.ci.yml => docker/docker-compose.ci.yml (81%)
 rename docker-run.dev.sh => docker/docker-run.dev.sh (100%)
 rename selfhosted.Dockerfile => docker/selfhosted.Dockerfile (100%)

diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
index 60000ba..f80cca4 100644
--- a/.github/workflows/docker_release.yml
+++ b/.github/workflows/docker_release.yml
@@ -75,7 +75,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./selfhosted.Dockerfile
+          file: ./docker/selfhosted.Dockerfile
           # If the event is a release, use the release_arch, otherwise use the
           # platforms input if present, falling back to dev_arch
           platforms: ${{ github.event_name == 'release' && env.release_arch || (github.event.inputs.platforms || env.dev_arch) }}
diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
index 71e4ac8..48ca0b1 100644
--- a/.github/workflows/lint_and_test.yml
+++ b/.github/workflows/lint_and_test.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
     env:
-      COMPOSE_FILE: ./docker-compose.ci.yml
+      COMPOSE_FILE: ./docker/docker-compose.ci.yml
 
     steps:
       - name: Checkout code
diff --git a/README.md b/README.md
index d8e4564..ecf6886 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ services:
 2. Prepare the docker image in one of the two ways below:
    - **From GHCR:** `docker pull ghcr.io/kieraneglin/pinchflat:latest`
      - NOTE: also available on Docker Hub at `keglin/pinchflat:latest`
-   - **Building locally:** `docker build . --file selfhosted.Dockerfile -t ghcr.io/kieraneglin/pinchflat:latest`
+   - **Building locally:** `docker build . --file docker/selfhosted.Dockerfile -t ghcr.io/kieraneglin/pinchflat:latest`
 3. Run the container:
 
 ```bash
diff --git a/docker-compose.yml b/docker-compose.yml
index 31e897e..f3887a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,13 +3,13 @@ services:
   phx:
     build:
       context: .
-      dockerfile: dev.Dockerfile
+      dockerfile: ./docker/dev.Dockerfile
     volumes:
       - '.:/app'
     ports:
       - '4008:4008'
     command:
-      - ./docker-run.dev.sh
+      - ./docker/docker-run.dev.sh
     stdin_open: true
     tty: true
     env_file:
diff --git a/dev.Dockerfile b/docker/dev.Dockerfile
similarity index 98%
rename from dev.Dockerfile
rename to docker/dev.Dockerfile
index 2429ae8..c2a9699 100644
--- a/dev.Dockerfile
+++ b/docker/dev.Dockerfile
@@ -54,7 +54,7 @@ WORKDIR /app
 COPY . ./
 
 # Needs permissions to be updated AFTER the copy step
-RUN chmod +x ./docker-run.dev.sh
+RUN chmod +x ./docker/docker-run.dev.sh
 
 # Install Elixir deps
 # RUN mix archive.install github hexpm/hex branch latest
diff --git a/docker-compose.ci.yml b/docker/docker-compose.ci.yml
similarity index 81%
rename from docker-compose.ci.yml
rename to docker/docker-compose.ci.yml
index d4f4d6f..7d52a21 100644
--- a/docker-compose.ci.yml
+++ b/docker/docker-compose.ci.yml
@@ -3,7 +3,7 @@ services:
   phx:
     build:
       context: .
-      dockerfile: dev.Dockerfile
+      dockerfile: ./docker/dev.Dockerfile
     environment:
       - MIX_ENV=test
     volumes:
diff --git a/docker-run.dev.sh b/docker/docker-run.dev.sh
similarity index 100%
rename from docker-run.dev.sh
rename to docker/docker-run.dev.sh
diff --git a/selfhosted.Dockerfile b/docker/selfhosted.Dockerfile
similarity index 100%
rename from selfhosted.Dockerfile
rename to docker/selfhosted.Dockerfile