From 3e7c0f301e5ae038a5bcccda9369170ce1b6b858 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 28 Feb 2020 10:40:20 -0800 Subject: [PATCH] Remove our manual setup of vscode-java for theia... ... looks like this now just works from package.json file. So we were effectively installing more than one copy of the java support. --- concourse/tasks/prepare-theia-docker-image.sh | 7 +++++-- concourse/theia-docker-image/Dockerfile | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/concourse/tasks/prepare-theia-docker-image.sh b/concourse/tasks/prepare-theia-docker-image.sh index ddd7658d7..68c2edaf9 100755 --- a/concourse/tasks/prepare-theia-docker-image.sh +++ b/concourse/tasks/prepare-theia-docker-image.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e workdir=$(pwd) -vscode_java_url="https://marketplace.visualstudio.com/_apis/public/gallery/publishers/redhat/vsextensions/java/0.53.1/vspackage" echo "workdir=${workdir}" @@ -11,8 +10,12 @@ for i in ${workdir}/*-vsix-*/*.vsix ; do cp "$i" ${workdir}/output/plugins/ done +#Remove readme text file because theai doesn't like it? +rm "${workdir}/output/plugins/*.txt" + # Download vscode-java 0.53.1. Higher versions require vscode-client 0.40 or higher not available in Theia -curl ${vscode_java_url} > ${workdir}/output/plugins/vscode-java.vsix +#vscode_java_url="https://marketplace.visualstudio.com/_apis/public/gallery/publishers/redhat/vsextensions/java/0.53.1/vspackage" +#curl ${vscode_java_url} > ${workdir}/output/plugins/vscode-java.vsix ls -Rl ${workdir}/output diff --git a/concourse/theia-docker-image/Dockerfile b/concourse/theia-docker-image/Dockerfile index b89998bc1..7a3e12c25 100644 --- a/concourse/theia-docker-image/Dockerfile +++ b/concourse/theia-docker-image/Dockerfile @@ -24,7 +24,6 @@ RUN yarn --cache-folder ./ycache && rm -rf ./ycache && \ yarn theia download:plugins ADD plugins /theia-app/plugins -RUN rm /theia-app/plugins/README.txt ENV SHELL=/bin/bash \ THEIA_DEFAULT_PLUGINS=local-dir:/theia-app/plugins