diff --git a/.docker/bloop.yaml b/.docker/bloop.yaml new file mode 100644 index 0000000000..8eb1b2d7c9 --- /dev/null +++ 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 b/.docker/bloop/Dockerfile similarity index 100% rename from completers/bloop_completer/Dockerfile rename to .docker/bloop/Dockerfile diff --git a/.docker/nix.yaml b/.docker/nix.yaml new file mode 100644 index 0000000000..401b04af59 --- /dev/null +++ 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 b/.docker/nix/Dockerfile similarity index 100% rename from .docker/nix.Dockerfile rename to .docker/nix/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 22ff91f71b..c5042e66da 100644 --- 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: