From 61713b948a4921f69730e08cfd13f7fe0072982c Mon Sep 17 00:00:00 2001 From: Daniel S Date: Thu, 5 Oct 2023 22:40:09 +0200 Subject: [PATCH 1/4] move completions to Dockerfile --- build/Dockerfile | 16 ++++++++-------- build/bashrc | 8 +------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index d7062e9..05f9f1a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ # Builder stage -FROM node:18-bookworm as build-stage +FROM node:20-bookworm as build-stage # install required tools to build the application RUN apt-get update && \ @@ -16,10 +16,8 @@ COPY preload.html ./applications/browser/resources/preload.html COPY branding-util.tsx ./theia-extensions/product/src/browser/branding-util.tsx # customize package.json -RUN jq -s '.[0] * .[1]' package.json.acend package.json.orig > package.json.tmp1 && \ - jq 'del(.theiaPlugins."vscode-builtin-extensions-pack")' package.json.tmp1 > package.json.tmp2 && \ - jq 'del(.theiaPlugins."vscjava.vscode-java-pack")' package.json.tmp2 > package.json.tmp3 && \ - jq 'del(.theiaPlugins."vscjava.vscode-java-dependency")' package.json.tmp3 > package.json +RUN jq 'del(.theiaPlugins)' package.json > package.json.tmp + jq -s '.[0] * .[1]' package.json.acend package.json.tmp > package.json # Remove unnecesarry files for the browser application # Download plugins and build application production mode @@ -38,7 +36,7 @@ RUN yarn --pure-lockfile && \ rm -rf .git applications/electron theia-extensions/theia-blueprint-launcher theia-extensions/theia-blueprint-updater node_modules # Production stage uses a small base image -FROM node:18-bookworm-slim as production-stage +FROM node:20-bookworm-slim as production-stage # renovate: datasource=github-tags depName=argoproj/argo-cd ARG ARGOCD_VERSION=v2.8.4 @@ -127,6 +125,9 @@ RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash && \ ENV HOME /home/theia WORKDIR /home/theia +RUN for CMD in argocd helm kubectl oc tkn; do ${CMD} completion bash > /usr/share/bash-completion/completions/$CMD; done && \ + terraform -install-autocomplete + # Copy application from builder-stage COPY --from=build-stage --chown=theia:theia /home/theia /home/theia @@ -137,7 +138,7 @@ ENV SHELL=/bin/bash \ THEIA_DEFAULT_PLUGINS=local-dir:/home/theia/plugins \ USE_LOCAL_GIT=true -# Swtich to Theia user +# Switch to Theia user USER theia COPY bashrc /home/theia/.bashrc COPY profile /home/theia/.profile @@ -148,7 +149,6 @@ RUN cd /home/theia && \ ./krew-linux_amd64 install krew && \ rm -f krew-linux_amd64* && \ export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" && \ - # krew plugins for PLUGIN in ctx ns cert-manager cilium get-all modify-secret tree view-secret neat; do kubectl krew install $PLUGIN; done WORKDIR /home/theia/applications/browser diff --git a/build/bashrc b/build/bashrc index 78255d5..4d75c46 100644 --- a/build/bashrc +++ b/build/bashrc @@ -12,18 +12,12 @@ export DOCKER_HOST=tcp://localhost:2376 export DOCKER_TLS_VERIFY=1 export DOCKER_CERT_PATH=/home/project/.tls/client -for cmd in argocd helm kubectl oc tkn; do - source <(${cmd} completion bash) -done - alias k=kubectl complete -F __start_kubectl k +complete -C /usr/bin/terraform terraform export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" -/usr/bin/az.completion.sh -complete -C /usr/local/bin/terraform terraform - if [ ! -f "~/.kube/config" ]; then kubectl config set-cluster local --server="https://kubernetes.default" --certificate-authority "/run/secrets/kubernetes.io/serviceaccount/ca.crt" kubectl config set-credentials local --token="$(cat /run/secrets/kubernetes.io/serviceaccount/token)" From 46f0abaf86b473892a6a4ad9a06adab14c354168 Mon Sep 17 00:00:00 2001 From: Daniel S Date: Thu, 5 Oct 2023 22:40:40 +0200 Subject: [PATCH 2/4] create new release --- deploy/charts/webshell/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/charts/webshell/Chart.yaml b/deploy/charts/webshell/Chart.yaml index b2763b9..2ff917a 100644 --- a/deploy/charts/webshell/Chart.yaml +++ b/deploy/charts/webshell/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: webshell description: A Helm chart to deploy a webshell environment type: application -version: 0.5.1 -appVersion: "0.5.1" +version: 0.5.2 +appVersion: "0.5.2" From 6b02e788b2853be21ff2ccf37494a4441a4c7684 Mon Sep 17 00:00:00 2001 From: Daniel S Date: Thu, 5 Oct 2023 22:42:23 +0200 Subject: [PATCH 3/4] fixed issue --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 05f9f1a..b4d0576 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -16,7 +16,7 @@ COPY preload.html ./applications/browser/resources/preload.html COPY branding-util.tsx ./theia-extensions/product/src/browser/branding-util.tsx # customize package.json -RUN jq 'del(.theiaPlugins)' package.json > package.json.tmp +RUN jq 'del(.theiaPlugins)' package.json > package.json.tmp && \ jq -s '.[0] * .[1]' package.json.acend package.json.tmp > package.json # Remove unnecesarry files for the browser application From efe1fc26e692b8959fdccebd498d4138b191bd6e Mon Sep 17 00:00:00 2001 From: Daniel S Date: Thu, 5 Oct 2023 22:46:05 +0200 Subject: [PATCH 4/4] fixed issue --- build/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index b4d0576..e4473d9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -9,8 +9,7 @@ WORKDIR /tmp RUN git clone --depth 1 https://github.com/eclipse-theia/theia-blueprint.git WORKDIR /home/theia -RUN cp -r /tmp/theia-blueprint/* . && \ - mv package.json package.json.orig +RUN cp -r /tmp/theia-blueprint/* . COPY package.json.acend . COPY preload.html ./applications/browser/resources/preload.html COPY branding-util.tsx ./theia-extensions/product/src/browser/branding-util.tsx