Move to starting docker-compose in the dev-container

DiamondLightSource · Nov 13, 2024 · 5c6dd18 · 5c6dd18
1 parent feb276e
commit 5c6dd18
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,10 +1,13 @@
 // For format details, see https://containers.dev/implementors/json_reference/
 {
     "name": "Python 3 Developer Container",
-    "build": {
-        "dockerfile": "../Dockerfile",
-        "target": "developer"
-    },
+    "dockerComposeFile": [
+        "docker-compose.yml",
+        "docker-compose-infrastructure.yml"
+    ],
+    "service": "blueapi",
+    "workspaceFolder": "/workspaces/blueapi",
+    "shutdownAction": "stopCompose",
     "containerEnv": {
         "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL": "http/protobuf",
         "OTEL_EXPORTER_OTLP_ENDPOINT": "http://127.0.0.1:4318",

diff --git a/src/script/docker-compose.yml → ...ntainer/docker-compose-infrastructure.yml b/src/script/docker-compose.yml → ...ntainer/docker-compose-infrastructure.yml
diff --git a/.devcontainer/docker-compose-rabbitmq.yml b/.devcontainer/docker-compose-rabbitmq.yml
@@ -0,0 +1,10 @@
+services:
+  rabbitmq:
+    image: rabbitmq:management
+    container_name: 'rabbitmq'
+    ports:
+      - 5672:5672
+      - 15672:15672
+      - 61613:61613
+    volumes:
+      - ./rabbitmq_setup/enabled_plugins:/etc/rabbitmq/enabled_plugins
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -0,0 +1,7 @@
+services:
+  blueapi:
+    build:
+      target: developer
+      dockerfile: ../Dockerfile
+    volumes:
+      - ..:/workspaces:cached,z
diff --git a/src/script/rabbitmq_setup/enabled_plugins → .devcontainer/rabbitmq_setup/enabled_plugins b/src/script/rabbitmq_setup/enabled_plugins → .devcontainer/rabbitmq_setup/enabled_plugins
diff --git a/src/script/start_services.sh b/src/script/start_services.sh
diff --git a/src/script/stomp_config.yml → tests/system_tests/stomp_config.yml b/src/script/stomp_config.yml → tests/system_tests/stomp_config.yml