From fa69e53fa83891b5ca01b435262fd0cb30d00f03 Mon Sep 17 00:00:00 2001
From: oddgrd <29732646+oddgrd@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:35:11 +0100
Subject: [PATCH 1/2] refactor: move docker profiles to dev.yml

---
 docker-compose.dev.yml | 6 ++++++
 docker-compose.yml     | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ea1ac7eb2..c1f95de6b 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -23,3 +23,9 @@ services:
         exec /usr/local/bin/service "$${@:0}"
     ports:
       - 5000:8000
+  panamax:
+    profiles:
+      - panamax
+  deck-chores:
+    profiles:
+      - panamax
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fffc6dec..85ef0e204 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -173,8 +173,6 @@ services:
         constraints:
           - node.hostname==controller
   panamax:
-    profiles:
-      - panamax
     image: "${CONTAINER_REGISTRY}/panamax:${PANAMAX_TAG}"
     restart: always
     networks:
@@ -191,8 +189,6 @@ services:
         constraints:
           - node.hostname==controller
   deck-chores:
-    profiles:
-      - panamax
     image: funkyfuture/deck-chores:1
     restart: unless-stopped
     environment:

From d63b33f6793dfb17e1caf51eb22a5c691930c281 Mon Sep 17 00:00:00 2001
From: oddgrd <29732646+oddgrd@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:39:39 +0100
Subject: [PATCH 2/2] docs: update comment in makefile

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2bed9be28..c4752a48c 100644
--- a/Makefile
+++ b/Makefile
@@ -124,8 +124,8 @@ test:
 	cd e2e; POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) APPS_FQDN=$(APPS_FQDN) cargo test $(CARGO_TEST_FLAGS) -- --nocapture
 
 # Start the containers locally. This does not start panamax by default,
-# to start panamax locally run this command with the COMPOSE_PROFILES=panamax 
-# environment variable.
+# to start panamax locally run this command with an override for the profiles:
+# `make COMPOSE_PROFILES=panamax up`
 up: docker-compose.rendered.yml
 	CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) $(DOCKER_COMPOSE) -f $< -p $(STACK) up -d $(DOCKER_COMPOSE_FLAGS)