From a0e55e4830f00ef4b890afe92b16b9674e0dab9c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 21:39:29 +0200
Subject: [PATCH] Removed cron container from debug build

---
 docker/docker-compose.override.yml | 14 ++++++++++++++
 docker/docker-compose.yml          | 13 -------------
 fejctl                             |  3 ++-
 3 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 docker/docker-compose.override.yml

diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
new file mode 100644
index 0000000..88c3a22
--- /dev/null
+++ b/docker/docker-compose.override.yml
@@ -0,0 +1,14 @@
+version: '2.4'
+
+services:
+    cron:
+        image: 'chewingbever/fej:latest'
+        restart: 'always'
+
+        entrypoint: 'crond -f'
+        user: 'root'
+        healthcheck:
+            disable: true
+
+        environment:
+            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 55c5990..f2a19e0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,18 +12,6 @@ services:
         environment:
             - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
 
-    cron:
-        image: 'chewingbever/fej:latest'
-        restart: 'always'
-
-        entrypoint: 'crond -f'
-        user: 'root'
-        healthcheck:
-            disable: true
-
-        environment:
-            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
-
     db:
         image: 'postgres:13-alpine'
         restart: 'always'
@@ -42,6 +30,5 @@ services:
         volumes:
             - 'db-data:/var/lib/postgresql/data'
 
-
 volumes:
     db-data:
diff --git a/fejctl b/fejctl
index a8fc12d..6701343 100755
--- a/fejctl
+++ b/fejctl
@@ -31,6 +31,7 @@ function dc() {
     if [[ "$release" -eq 1 ]]; then
         DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
             --file docker/docker-compose.yml \
+            --file docker/docker-compose.override.yml \
             --project-name fej \
             "$@"
 
@@ -112,7 +113,7 @@ function main() {
         l | logs ) dc -- logs -f app ;;
         lint ) cargo fmt -- --check ;;
         p | push | publish ) publish ;;
-        t | test ) dc test --no-fail-fast  ;;
+        t | test ) dcr -- test --no-fail-fast && dc -- logs -f app ;;
         * ) >&2 echo "Invalid command."; exit 1 ;;
     esac
 }