From bea9ce4c4a3a975777dadde07ca9054ef9a9343f Mon Sep 17 00:00:00 2001
From: STAM <developer@epicm.org>
Date: Thu, 2 Sep 2021 13:38:37 +0300
Subject: [PATCH] TC Agent Node update

---
 linux/teamcity/agent/node12/Dockerfile | 13 +++++++++----
 linux/teamcity/agent/node14/Dockerfile | 13 +++++++++----
 linux/teamcity/agent/node15/Dockerfile | 13 +++++++++----
 linux/teamcity/agent/node16/Dockerfile | 13 +++++++++----
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/linux/teamcity/agent/node12/Dockerfile b/linux/teamcity/agent/node12/Dockerfile
index 97432aad6..157c8959f 100644
--- a/linux/teamcity/agent/node12/Dockerfile
+++ b/linux/teamcity/agent/node12/Dockerfile
@@ -48,11 +48,16 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
     echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
-    apt-get install -y nodejs yarn && \
-    npm install -g npm
+    apt-get install -y nodejs yarn
 
-RUN node -v && \
-    npm -v
+#   curl -L https://www.npmjs.com/install.sh | sh
+#   npm install -g npm
+
+RUN echo "=============================================" && \
+    echo node $(node --version) && \
+    echo npm $(npm --version) && \
+    echo yarn $(yarn --version) && \
+    echo "============================================="
 
 ##################################################################
 #                   cleaninig up
diff --git a/linux/teamcity/agent/node14/Dockerfile b/linux/teamcity/agent/node14/Dockerfile
index ec0087f74..a0035fd44 100644
--- a/linux/teamcity/agent/node14/Dockerfile
+++ b/linux/teamcity/agent/node14/Dockerfile
@@ -48,11 +48,16 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
     echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
-    apt-get install -y nodejs yarn && \
-    npm install -g npm
+    apt-get install -y nodejs yarn
 
-RUN node -v && \
-    npm -v
+#   curl -L https://www.npmjs.com/install.sh | sh
+#   npm install -g npm
+
+RUN echo "=============================================" && \
+    echo node $(node --version) && \
+    echo npm $(npm --version) && \
+    echo yarn $(yarn --version) && \
+    echo "============================================="
 
 ##################################################################
 #                   cleaninig up
diff --git a/linux/teamcity/agent/node15/Dockerfile b/linux/teamcity/agent/node15/Dockerfile
index dda7669f5..cafcc8b30 100644
--- a/linux/teamcity/agent/node15/Dockerfile
+++ b/linux/teamcity/agent/node15/Dockerfile
@@ -48,11 +48,16 @@ RUN curl -sL https://deb.nodesource.com/setup_15.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
     echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
-    apt-get install -y nodejs yarn && \
-    npm install -g npm
+    apt-get install -y nodejs yarn
 
-RUN node -v && \
-    npm -v
+#   curl -L https://www.npmjs.com/install.sh | sh
+#   npm install -g npm
+
+RUN echo "=============================================" && \
+    echo node $(node --version) && \
+    echo npm $(npm --version) && \
+    echo yarn $(yarn --version) && \
+    echo "============================================="
 
 ##################################################################
 #                   cleaninig up
diff --git a/linux/teamcity/agent/node16/Dockerfile b/linux/teamcity/agent/node16/Dockerfile
index 7e6e722b5..78eb6cbaf 100644
--- a/linux/teamcity/agent/node16/Dockerfile
+++ b/linux/teamcity/agent/node16/Dockerfile
@@ -48,11 +48,16 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
     echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
-    apt-get install -y nodejs yarn && \
-    npm install -g npm
+    apt-get install -y nodejs yarn
 
-RUN node -v && \
-    npm -v
+#   curl -L https://www.npmjs.com/install.sh | sh
+#   npm install -g npm
+
+RUN echo "=============================================" && \
+    echo node $(node --version) && \
+    echo npm $(npm --version) && \
+    echo yarn $(yarn --version) && \
+    echo "============================================="
 
 ##################################################################
 #                   cleaninig up