From f2a9b1ac401d495a7f8301a01513205a10051806 Mon Sep 17 00:00:00 2001
From: Philippe Caron <amazingphilippe@gmail.com>
Date: Fri, 1 Nov 2024 17:26:02 +0000
Subject: [PATCH] create docker compose yml, removed old yml in root, add
 config with networks, updated pyproject packages

---
 .devcontainer/devcontainer.json  |  1 +
 .devcontainer/docker-compose.yml | 12 ++++++++++++
 docker-compose.yml               | 19 -------------------
 pyproject.toml                   |  4 +++-
 4 files changed, 16 insertions(+), 20 deletions(-)
 create mode 100644 .devcontainer/docker-compose.yml
 delete mode 100644 docker-compose.yml

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4e41ed3577..9de4e1b038 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -47,6 +47,7 @@
 	"forwardPorts": [
 		6012
 	],
+	"runArgs": ["--network=notification-network", "--env-file=${localWorkspaceFolder}/.env"],
 	"postCreateCommand": "notify-dev-entrypoint.sh",
 	"remoteUser": "vscode"
 }
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000000..50826514cd
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3'
+services:
+  web:
+    build:
+      context: ./
+      dockerfile: ci/Dockerfile
+    networks:
+      - notification-network
+
+networks:
+  notification-network:
+    external: true
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 6b70bb0b31..0000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '2'
-
-services:
-  web:
-    restart: on-failure
-    image: notification-admin
-    build:
-      context: ./
-      dockerfile: ci/Dockerfile
-    command: >
-      bash -c "
-        make babel &&
-        npm install &&
-        npm run build &&
-        flask run -p 6012 --host=0.0.0.0"
-    volumes:
-      - .:/app
-    ports:
-        - "6012:6012"
diff --git a/pyproject.toml b/pyproject.toml
index b688f6287a..bb927d0f21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,9 @@ description = "Notifications admin application."
 authors = ["Canadian Digital Service"]
 license = "MIT license"
 readme = "README.md"
-packages = []
+packages = [
+    { include = "app" }
+]
 
 [build-system]
 requires = ["poetry-core>=1.7.1"]