Merge pull request #2652 from carapace-sh/docker-compose-include

use `include` for docker-compose
carapace-sh · Dec 22, 2024 · f8572f9 · f8572f9
2 parents 100073e + 5323dad
commit f8572f9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/.docker/bloop.yaml b/.docker/bloop.yaml
@@ -0,0 +1,7 @@
+services:
+  bloop:
+    build:
+      context: bloop
+    image: ghcr.io/carapace-sh/carapace-bin:bloop
+    volumes:
+      - '..:/carapace-bin:ro'
diff --git a/completers/bloop_completer/Dockerfile → .docker/bloop/Dockerfile b/completers/bloop_completer/Dockerfile → .docker/bloop/Dockerfile
diff --git a/.docker/nix.yaml b/.docker/nix.yaml
@@ -0,0 +1,7 @@
+services:
+  nix:
+    build:
+      context: nix
+    image: ghcr.io/carapace-sh/carapace-bin:nix
+    volumes:
+      - '..:/carapace-bin:ro'
diff --git a/.docker/nix.Dockerfile → .docker/nix/Dockerfile b/.docker/nix.Dockerfile → .docker/nix/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   build: &base
     image: ghcr.io/carapace-sh/carapace
@@ -79,14 +77,9 @@ services:
     #  user: 1000:1000
     command: bash -c 'go run ./cmd/carafmt completers/*/cmd/*.go'
 
-  nix:
-    build:
-      context: .docker
-      dockerfile: nix.Dockerfile
-    image: nixos/nix
-    volumes:
-      - '.:/carapace-bin:ro'
-
+include:
+  - .docker/bloop.yaml
+  - .docker/nix.yaml
 
 volumes:
   go: