From 017f5c7c4ee36e689c1a8d8df092bf0a33275088 Mon Sep 17 00:00:00 2001
From: rsteube <rsteube@users.noreply.github.com>
Date: Sun, 22 Dec 2024 15:40:02 +0100
Subject: [PATCH] moved core compose services

---
 .docker/bloop.yaml                          | 1 +
 .docker/bloop/Dockerfile                    | 2 +-
 docker-compose.yml => .docker/carapace.yaml | 6 +-----
 .docker/nix.yaml                            | 1 +
 compose.yaml                                | 6 ++++++
 5 files changed, 10 insertions(+), 6 deletions(-)
 rename docker-compose.yml => .docker/carapace.yaml (94%)
 create mode 100644 compose.yaml

diff --git a/.docker/bloop.yaml b/.docker/bloop.yaml
index 8eb1b2d7c9..3c26c00d09 100644
--- a/.docker/bloop.yaml
+++ b/.docker/bloop.yaml
@@ -3,5 +3,6 @@ services:
     build:
       context: bloop
     image: ghcr.io/carapace-sh/carapace-bin:bloop
+    hostname: carapace-bin:bloop
     volumes:
       - '..:/carapace-bin:ro'
diff --git a/.docker/bloop/Dockerfile b/.docker/bloop/Dockerfile
index d2c931c67a..344daf4b72 100644
--- a/.docker/bloop/Dockerfile
+++ b/.docker/bloop/Dockerfile
@@ -12,4 +12,4 @@ RUN cs install bloop --only-prebuilt=true
 
 ENV PATH="$PATH:/root/.local/share/coursier/bin"
 RUN bloop
-ENTRYPOINT [ "bash" ]
+ENTRYPOINT [ "elvish" ]
diff --git a/docker-compose.yml b/.docker/carapace.yaml
similarity index 94%
rename from docker-compose.yml
rename to .docker/carapace.yaml
index c5042e66da..dcc91e71fe 100644
--- a/docker-compose.yml
+++ b/.docker/carapace.yaml
@@ -6,7 +6,7 @@ services:
       CARAPACE_BRIDGES: zsh,fish,bash
       TARGET: /carapace-bin/cmd/carapace/carapace
     volumes:
-      - '.:/carapace-bin/'
+      - '..:/carapace-bin/'
       - 'go:/home/circleci/go/'
 
   bash:
@@ -77,9 +77,5 @@ services:
     #  user: 1000:1000
     command: bash -c 'go run ./cmd/carafmt completers/*/cmd/*.go'
 
-include:
-  - .docker/bloop.yaml
-  - .docker/nix.yaml
-
 volumes:
   go:
diff --git a/.docker/nix.yaml b/.docker/nix.yaml
index 401b04af59..703bff9b5b 100644
--- a/.docker/nix.yaml
+++ b/.docker/nix.yaml
@@ -3,5 +3,6 @@ services:
     build:
       context: nix
     image: ghcr.io/carapace-sh/carapace-bin:nix
+    hostname: carapace-bin:nix
     volumes:
       - '..:/carapace-bin:ro'
diff --git a/compose.yaml b/compose.yaml
new file mode 100644
index 0000000000..57a4648f5e
--- /dev/null
+++ b/compose.yaml
@@ -0,0 +1,6 @@
+include:
+  # shells and build related services
+  - .docker/carapace.yaml
+  # tools
+  - .docker/bloop.yaml
+  - .docker/nix.yaml