Skip to content

Commit ee4dde0

Browse files
authored
feat(docker)!: migrate to docker-language-server (#1650)
1 parent c67226a commit ee4dde0

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

lua/astrocommunity/pack/docker/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
This plugin pack does the following:
44

55
- Adds `dockerfile` Treesitter parser
6-
- Adds `dockerfile-language-server` and `docker-compose-language-service` language servers
7-
- Adds `hadolint` linter
6+
- Adds [`docker-language-server`](https://github.com/docker/docker-language-server) for providing features for the Docker ecosystem
7+
- Adds [`hadolint`](https://github.com/hadolint/hadolint) linter

lua/astrocommunity/pack/docker/init.lua

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1+
---@type LazySpec
12
return {
23
{ import = "astrocommunity.pack.yaml" },
34
{
45
"AstroNvim/astrocore",
56
---@type AstroCoreOpts
67
opts = { filetypes = { filename = { ["docker-compose.yaml"] = "yaml.docker-compose" } } },
78
},
8-
{
9-
"AstroNvim/astrolsp",
10-
optional = true,
11-
---@type AstroLSPOpts
12-
opts = {
13-
formatting = {
14-
filter = function(client) return client.name ~= "docker_compose_language_service" end,
15-
},
16-
},
17-
},
189
{
1910
"nvim-treesitter/nvim-treesitter",
2011
optional = true,
@@ -28,10 +19,8 @@ return {
2819
"williamboman/mason-lspconfig.nvim",
2920
optional = true,
3021
opts = function(_, opts)
31-
opts.ensure_installed = require("astrocore").list_insert_unique(
32-
opts.ensure_installed,
33-
{ "docker_compose_language_service", "dockerls" }
34-
)
22+
opts.ensure_installed =
23+
require("astrocore").list_insert_unique(opts.ensure_installed, { "docker-language-server" })
3524
end,
3625
},
3726
{
@@ -45,10 +34,8 @@ return {
4534
"WhoIsSethDaniel/mason-tool-installer.nvim",
4635
optional = true,
4736
opts = function(_, opts)
48-
opts.ensure_installed = require("astrocore").list_insert_unique(
49-
opts.ensure_installed,
50-
{ "docker-compose-language-service", "dockerfile-language-server", "hadolint" }
51-
)
37+
opts.ensure_installed =
38+
require("astrocore").list_insert_unique(opts.ensure_installed, { "docker-language-server", "hadolint" })
5239
end,
5340
},
5441
{

0 commit comments

Comments
 (0)