Merge pull request #2653 from carapace-sh/compose-mv

moved core compose services

.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'

.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" ]

docker-compose.yml → .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:

.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'

compose.yaml

@@ -0,0 +1,6 @@
+include:
+  # shells and build related services
+  - .docker/carapace.yaml
+  # tools
+  - .docker/bloop.yaml
+  - .docker/nix.yaml