From 79af9ab73b83a5a66616425c6b9fba9e3f1a6134 Mon Sep 17 00:00:00 2001
From: Robert Dailey <git@rdailey.me>
Date: Thu, 4 Apr 2024 19:06:30 -0500
Subject: [PATCH] wip

---
 BuildAndRun.ps1                               |  34 +++++++++++++
 docker/Dockerfile => Dockerfile               |   4 +-
 .../certs/self-signed-cert-for-radarr.pfx     | Bin 5133 -> 0 bytes
 .../docker-compose.yml => docker-compose.yml  |   6 ++-
 docker/BuildAndRun.ps1                        |  48 ------------------
 .../debugging}/certs/cert-passwords.txt       |   0
 .../debugging}/docker-compose.yml             |   0
 7 files changed, 40 insertions(+), 52 deletions(-)
 create mode 100644 BuildAndRun.ps1
 rename docker/Dockerfile => Dockerfile (87%)
 delete mode 100644 debugging/certs/self-signed-cert-for-radarr.pfx
 rename docker/docker-compose.yml => docker-compose.yml (86%)
 delete mode 100644 docker/BuildAndRun.ps1
 rename {debugging => docker/debugging}/certs/cert-passwords.txt (100%)
 rename {debugging => docker/debugging}/docker-compose.yml (100%)

diff --git a/BuildAndRun.ps1 b/BuildAndRun.ps1
new file mode 100644
index 00000000..912bcb1c
--- /dev/null
+++ b/BuildAndRun.ps1
@@ -0,0 +1,34 @@
+[CmdletBinding()]
+param (
+    [string] $Runtime = "linux-musl-x64",
+    [string[]] $RunArgs
+)
+
+$ErrorActionPreference = "Stop"
+
+$artifactsDir = "$PSScriptRoot\docker\artifacts"
+
+# Delete old build artifacts
+Remove-Item $artifactsDir -Recurse -Force -ErrorAction SilentlyContinue
+
+# Publish new build artifacts
+& .\ci\Publish.ps1 -NoSingleFile `
+    -OutputDir "$artifactsDir\$Runtime" `
+    -Runtime $Runtime
+
+# Start the corresponding radarr/sonarr docker containers for testing/debugging
+Push-Location "$PSScriptRoot\docker\debugging"
+try {
+    docker compose up -d --pull always
+    if ($LASTEXITCODE -ne 0) {
+        throw "failed to bring up services stack"
+    }
+}
+finally {
+    Pop-Location
+}
+
+docker compose run --rm --build app @RunArgs
+if ($LASTEXITCODE -ne 0) {
+    throw "docker compose run failed"
+}
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 87%
rename from docker/Dockerfile
rename to Dockerfile
index baa6fa04..bcd19f0b 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -22,8 +22,8 @@ RUN set -ex; \
     apk add --no-cache bash tzdata supercronic git tini; \
     mkdir -p /config && chown 1000:1000 /config;
 
-COPY ./artifacts/$RUNTIME /app/recyclarr/
-COPY --chmod=555 ./scripts/prod/*.sh /
+COPY ./docker/artifacts/$RUNTIME /app/recyclarr/
+COPY --chmod=555 ./docker/scripts/prod/*.sh /
 
 USER 1000:1000
 VOLUME /config
diff --git a/debugging/certs/self-signed-cert-for-radarr.pfx b/debugging/certs/self-signed-cert-for-radarr.pfx
deleted file mode 100644
index e3930bff7a272123f51dc8902882737798b62417..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5133
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

diff --git a/docker/docker-compose.yml b/docker-compose.yml
similarity index 86%
rename from docker/docker-compose.yml
rename to docker-compose.yml
index 4887507e..ad6a9f9c 100644
--- a/docker/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,12 @@
+name: recyclarr
+
 networks:
   recyclarr:
     name: recyclarr_dev
     external: true
 
 services:
-  recyclarr:
+  app:
     image: ghcr.io/recyclarr/recyclarr:edge
     user: $DOCKER_UID:$DOCKER_GID
     container_name: recyclarr
@@ -14,7 +16,7 @@ services:
         - TARGETARCH=amd64
     networks: [recyclarr]
     volumes:
-      - ./config:/config
+      - ./docker/config:/config
     environment:
       CRON_SCHEDULE: "* * * * *"
       TZ: America/Chicago
diff --git a/docker/BuildAndRun.ps1 b/docker/BuildAndRun.ps1
deleted file mode 100644
index 05ef2768..00000000
--- a/docker/BuildAndRun.ps1
+++ /dev/null
@@ -1,48 +0,0 @@
-[CmdletBinding()]
-param (
-    [string] $Runtime = "linux-musl-x64",
-    [string[]] $RunArgs
-)
-
-$ErrorActionPreference = "Stop"
-
-$artifactsDir = "$PSScriptRoot\artifacts"
-
-# Delete old build artifacts
-Remove-Item $artifactsDir -Recurse -Force -ErrorAction SilentlyContinue
-
-# Publish new build artifacts
-Push-Location $PSScriptRoot\..
-try {
-    & .\ci\Publish.ps1 -NoSingleFile `
-        -OutputDir "$artifactsDir\$Runtime" `
-        -Runtime $Runtime
-}
-finally {
-    Pop-Location
-}
-
-# Start the corresponding radarr/sonarr docker containers for testing/debugging
-Push-Location "$PSScriptRoot\..\debugging"
-try {
-    docker compose up -d --pull always
-    if ($LASTEXITCODE -ne 0) {
-        throw "docker compose up failed"
-    }
-}
-finally {
-    Pop-Location
-}
-
-# Finally, build the docker image and run it
-docker compose build
-if ($LASTEXITCODE -ne 0) {
-    throw "docker compose build failed"
-}
-
-# TODO: Use `--build` when it releases:
-# https://github.com/docker/compose/issues/10003
-docker compose run --rm recyclarr @RunArgs
-if ($LASTEXITCODE -ne 0) {
-    throw "docker compose run failed"
-}
diff --git a/debugging/certs/cert-passwords.txt b/docker/debugging/certs/cert-passwords.txt
similarity index 100%
rename from debugging/certs/cert-passwords.txt
rename to docker/debugging/certs/cert-passwords.txt
diff --git a/debugging/docker-compose.yml b/docker/debugging/docker-compose.yml
similarity index 100%
rename from debugging/docker-compose.yml
rename to docker/debugging/docker-compose.yml