From 6c4a0ffc615e00a0a8d2b593b22ba4a2ac349d06 Mon Sep 17 00:00:00 2001 From: Evgeny Zislis Date: Tue, 18 Jun 2024 02:44:52 +0300 Subject: [PATCH 1/4] feat(toml): add container for taplo toml language server --- docker-compose.yaml | 5 +++++ servers/taplols/Dockerfile | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 servers/taplols/Dockerfile diff --git a/docker-compose.yaml b/docker-compose.yaml index 9bb80e1..3fd0070 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -106,6 +106,11 @@ services: build: context: servers/tailwindcss + taplo: + image: lspcontainers/taplo-language-server + build: + context: servers/taplols + terraformls: image: lspcontainers/terraform-ls build: diff --git a/servers/taplols/Dockerfile b/servers/taplols/Dockerfile new file mode 100644 index 0000000..abb0b29 --- /dev/null +++ b/servers/taplols/Dockerfile @@ -0,0 +1,9 @@ +FROM alpine + +RUN apk add --no-cache \ + nodejs \ + npm \ + && npm install -g \ + @taplo/lsp + +CMD [ "taplo", "lsp", "stdio" ] From 758d4d51e9fb57c268200d8499ac40fa565f7ba8 Mon Sep 17 00:00:00 2001 From: Evgeny Zislis Date: Tue, 18 Jun 2024 03:09:31 +0300 Subject: [PATCH 2/4] fix(toml): special image for taplo --- servers/taplols/Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/servers/taplols/Dockerfile b/servers/taplols/Dockerfile index abb0b29..72df92c 100644 --- a/servers/taplols/Dockerfile +++ b/servers/taplols/Dockerfile @@ -1,9 +1,3 @@ -FROM alpine - -RUN apk add --no-cache \ - nodejs \ - npm \ - && npm install -g \ - @taplo/lsp +FROM tamasfe/taplo:full CMD [ "taplo", "lsp", "stdio" ] From 046a74c7bfd12d6a73be163b234dcde4b0ad283c Mon Sep 17 00:00:00 2001 From: Evgeny Zislis Date: Tue, 18 Jun 2024 03:12:31 +0300 Subject: [PATCH 3/4] fix(toml): add taplo image to GH actions --- .github/workflows/build-image.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index e7eaae8..32e01cc 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -78,6 +78,9 @@ jobs: - context: tailwindcss tag: tailwindcss-language-server + - context: taplo + tag: taplo-language-server + - context: terraformls tag: terraform-ls From 3c4cd89b8149d2a5806e76d964861e87584c0714 Mon Sep 17 00:00:00 2001 From: Evgeny Zislis Date: Tue, 18 Jun 2024 03:14:34 +0300 Subject: [PATCH 4/4] fix(toml): proper docker CMD given the ENTRYPOINT --- servers/taplols/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/taplols/Dockerfile b/servers/taplols/Dockerfile index 72df92c..7c0ede3 100644 --- a/servers/taplols/Dockerfile +++ b/servers/taplols/Dockerfile @@ -1,3 +1,3 @@ FROM tamasfe/taplo:full -CMD [ "taplo", "lsp", "stdio" ] +CMD [ "lsp", "stdio" ]