From 5d4995e01ed03d2fc91d7a93881d3cc151149916 Mon Sep 17 00:00:00 2001
From: bsrdjan <srdjan.boskovic@sap.com>
Date: Sun, 29 Oct 2023 07:36:44 +0100
Subject: [PATCH] build(docker): cf cli by default disabled in Kyma docker
 container

---
 docker/btp-cflinuxfs4.Dockerfile | 13 +++++++------
 docker/common/nodejs.Dockerfile  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/btp-cflinuxfs4.Dockerfile b/docker/btp-cflinuxfs4.Dockerfile
index 850a2d5..5c23868 100644
--- a/docker/btp-cflinuxfs4.Dockerfile
+++ b/docker/btp-cflinuxfs4.Dockerfile
@@ -59,7 +59,7 @@ ENV LC_ALL en_US.UTF-8
 USER ${adminuser}
 WORKDIR /home/${adminuser}
 
-RUN mkdir /home/${adminuser}/tmp; \
+RUN \
   printf "alias e=exit\nalias ..=cd..\nalias :q=exit\nalias ll='ls -l'\nalias la='ls -la'\nalias distro='cat /etc/*-release'\n" > .bash_aliases && \
   printf "\n# colors\nexport TERM=xterm-256color\n" >> ~/.bashrc && \
   # git configuration
@@ -71,11 +71,12 @@ RUN mkdir /home/${adminuser}/tmp; \
 # # python
 # INCLUDE+ common/python.Dockerfile
 
-# cf cli
-RUN wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - && \
-  echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list && \
-  sudo apt-get update && \
-  sudo apt-get install cf8-cli
+# # cf cli - if needed
+# RUN mkdir /home/${adminuser}/tmp; \
+#   wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - && \
+#   echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list && \
+#   sudo apt-get update && \
+#   sudo apt-get install cf8-cli
 
 # nvm
 INCLUDE+ common/nodejs.Dockerfile
diff --git a/docker/common/nodejs.Dockerfile b/docker/common/nodejs.Dockerfile
index 612dafb..24bd0bb 100644
--- a/docker/common/nodejs.Dockerfile
+++ b/docker/common/nodejs.Dockerfile
@@ -17,7 +17,7 @@ RUN \
     # nvm
     NVM_VERSION=$(curl -s https://github.com/gitapi/repos/nvm-sh/nvm/releases/latest | grep '"tag_name"' | sed -E 's/.*"v([^"]+)".*/\1/') && \
     curl -o- https://github.com/raw/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash && \
-    bash -ic "nvm install node && nvm install 20 && nvm install v18.18.2 && nvm && alias cfdefault v18.18.2" && \
+    bash -ic "nvm install node && nvm install 20 && nvm install 18.18.2 && nvm alias cfdefault 18.18.2" && \
     # bashrc
     cat /tmp/bashrc_nvm.sh >> .bashrc && \
     echo "nvm use cfdefault" >> .bashrc && \