From 4262e81793ba7adfc68e28f4bcfe27dcd00f84a2 Mon Sep 17 00:00:00 2001
From: Dennis Siemensma <github@dennissiemensma.nl>
Date: Mon, 10 Jun 2024 20:50:16 +0200
Subject: [PATCH] Rework local dev/test container setup #1196

---
 .idea/runConfigurations/Docker__Black_reformat.xml | 2 +-
 .idea/runConfigurations/Docker__Flake8.xml         | 2 +-
 .idea/runConfigurations/Docker__MyPy.xml           | 2 +-
 .idea/runConfigurations/Docker__Poetry_update.xml  | 2 +-
 provisioning/container/compose.dev.yml             | 1 -
 provisioning/container/compose.test.yml            | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.idea/runConfigurations/Docker__Black_reformat.xml b/.idea/runConfigurations/Docker__Black_reformat.xml
index 29476c74..7400406d 100644
--- a/.idea/runConfigurations/Docker__Black_reformat.xml
+++ b/.idea/runConfigurations/Docker__Black_reformat.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker: Black reformat" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="docker exec -it dev-dsmr-app poetry run black ." />
+    <option name="SCRIPT_TEXT" value="docker compose exec -it dev-dsmr-app poetry run black ." />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/.idea/runConfigurations/Docker__Flake8.xml b/.idea/runConfigurations/Docker__Flake8.xml
index b72ba318..e3b31246 100644
--- a/.idea/runConfigurations/Docker__Flake8.xml
+++ b/.idea/runConfigurations/Docker__Flake8.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker: Flake8" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="docker exec -it dev-dsmr-app poetry run flake8" />
+    <option name="SCRIPT_TEXT" value="docker compose exec -it dev-dsmr-app poetry run flake8" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/.idea/runConfigurations/Docker__MyPy.xml b/.idea/runConfigurations/Docker__MyPy.xml
index 303dc82e..ec681788 100644
--- a/.idea/runConfigurations/Docker__MyPy.xml
+++ b/.idea/runConfigurations/Docker__MyPy.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker: MyPy" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="docker exec -it dev-dsmr-app poetry run mypy dsmr_* --show-error-codes" />
+    <option name="SCRIPT_TEXT" value="docker compose exec -it dev-dsmr-app poetry run mypy dsmr_* --show-error-codes" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/.idea/runConfigurations/Docker__Poetry_update.xml b/.idea/runConfigurations/Docker__Poetry_update.xml
index f8e263bb..ee03bbb4 100644
--- a/.idea/runConfigurations/Docker__Poetry_update.xml
+++ b/.idea/runConfigurations/Docker__Poetry_update.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker: Poetry update" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="docker exec -it dev-dsmr-app poetry update" />
+    <option name="SCRIPT_TEXT" value="docker compose exec -it dev-dsmr-app poetry update" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/provisioning/container/compose.dev.yml b/provisioning/container/compose.dev.yml
index 0205e8ce..cbdb2dbb 100644
--- a/provisioning/container/compose.dev.yml
+++ b/provisioning/container/compose.dev.yml
@@ -2,7 +2,6 @@
 # Compose for DSMR-reader development only, NEVER use in production! #
 ######################################################################
 
-version: "3.9"
 services:
   # http://localhost:8000
   dev-dsmr-app:
diff --git a/provisioning/container/compose.test.yml b/provisioning/container/compose.test.yml
index 7b10d1cf..1d762814 100644
--- a/provisioning/container/compose.test.yml
+++ b/provisioning/container/compose.test.yml
@@ -2,7 +2,6 @@
 # Compose for DSMR-reader development only, NEVER use in production! #
 ######################################################################
 
-version: "3.9"
 services:
   tests-dsmr-app:
     container_name: tests-dsmr-app