Merge branch 'main' of https://github.tools.sap/E-Mobility/mbt-docker into multiple...

diff --git a/.xmake.cfg b/.xmake.cfg
index ce126340a730beda045abd6deb2bc0fe93293496..dfceb57435f0e4fa91faae0e245e23769155812a 100644 (file)
--- a/.xmake.cfg
+++ b/.xmake.cfg
@@ -1,5 +1,5 @@
 [xmake]
-version=1.0.13
+version=1.0.14
 # https://github.wdf.sap.corp/pages/xmake-ci/User-Guide/Setting_up_a_Build/Release_Procedure/Release_Versions/
 
 [buildplugin]

diff --git a/Dockerfile b/Dockerfile
index 4a0ce665743737efeadd61a9265dbf8668a3b762..24fc69143f99b6bb313fede14a21a268e284c10d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,8 +71,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       | sort -u \
       | xargs -r apt-mark manual \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    # for npm link
-    && chown -R ${USER}:${USER} /usr/local/lib/node_modules \
     && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
     # smoke tests
     && node --version \
@@ -215,5 +213,8 @@ RUN set -ex \
   # smoke test
   && python3 --version
 
+# Allow global npm packages install without sudo
+ENV NPM_CONFIG_PREFIX ${USER_HOME_DIR}/.npm-global
+
 WORKDIR /project
 USER ${USER}