Merge pull request #12 from Mahad-10/run-crossbar-container-from-compose

Run crossbar from compose file
xconnio · Jan 14, 2025 · a40e0bb · a40e0bb
2 parents 9daab62 + e42e702
commit a40e0bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -15,9 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build crossbar docker
-        run: make build-docker-crossbar
-
       - name: Build xconn docker
         run: make build-docker-xconn
 

diff --git a/Dockerfile.crossbar b/Dockerfile.crossbar
diff --git a/Dockerfile.xconn b/Dockerfile.xconn
@@ -11,6 +11,5 @@ FROM ubuntu:22.04
 WORKDIR /app
 
 COPY --from=builder /app/xconn /app/
-COPY --from=builder /app/cmd/config.yaml /app/
 
 CMD ["./xconn", "--config", "config.yaml"]
diff --git a/Makefile b/Makefile
@@ -1,6 +1,3 @@
-build-docker-crossbar:
-	docker build -t crossbar-image -f Dockerfile.crossbar .
-
 run-docker-crossbar:
 	docker compose -f docker-compose.yml run --rm crossbar
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,19 +2,21 @@ version: "3.10"
 
 services:
   crossbar:
+    user: root
     container_name: crossbar-container
-    image: "crossbar-image"
+    image: "crossbario/crossbar"
     restart: always
     network_mode: host
     stdin_open: true
     tty: true
-    ports:
-      - "8081:8081"
+    volumes:
+      - ./crossbar/.crossbar/:/node/.crossbar/
+      - ./crossbar/backend.py:/node/backend.py
 
   xconn:
     container_name: xconn
     image: "xconn-image"
     restart: always
     network_mode: host
-    ports:
-      - "8080:8080"
+    volumes:
+      - ./xconn/cmd/config.yaml:/app/config.yaml