From ddd49707626607e8f94c7ef3ac529d0d4f30c8b3 Mon Sep 17 00:00:00 2001
From: Phil Kunz <gitlab@philkunz.com>
Date: Sun, 27 May 2018 13:18:17 +0200
Subject: [PATCH] remove yarn

---
 .gitlab-ci.yml       | 4 ++--
 Dockerfile           | 3 ---
 Dockerfile_npmci     | 2 +-
 Dockerfile_npmdocker | 2 +-
 test/test_latest.sh  | 2 +-
 test/test_npmci.sh   | 4 ++--
 test/test_stable.sh  | 4 ++--
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f060f49..bf773f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
   - triggerPagesVerify
 
 before_script:
-  - yarn global add npmci
+  - npm install -g npmci
   - npmci docker login
 
 buildTest:
@@ -55,7 +55,7 @@ pages:
     - 'npmci -v'
   image: hosttoday/ht-docker-node:npmci
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g npmpage
     - npmci command npmpage
   only:
     - tags
diff --git a/Dockerfile b/Dockerfile
index f19a3df..5ce8f32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,10 +23,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         rsync \
         ssh \
         wget \
-    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
     && apt-get update \
-    && apt-get install yarn -y \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*
 
diff --git a/Dockerfile_npmci b/Dockerfile_npmci
index d62c462..24747ca 100644
--- a/Dockerfile_npmci
+++ b/Dockerfile_npmci
@@ -1,4 +1,4 @@
 FROM hosttoday/ht-docker-node:stable
 LABEL author="Lossless GmbH <office@lossless.com>"
 
-RUN yarn global add @shipzone/npmci
+RUN npm install -g @shipzone/npmci
diff --git a/Dockerfile_npmdocker b/Dockerfile_npmdocker
index ef2fa08..17c0606 100644
--- a/Dockerfile_npmdocker
+++ b/Dockerfile_npmdocker
@@ -1,4 +1,4 @@
 FROM hosttoday/ht-docker-node:stable
 LABEL author="Lossless GmbH <office@lossless.com>"
 
-RUN yarn global add npmci npmdocker @gitzone/npmts ts-node
\ No newline at end of file
+RUN npm install -g npmci npmdocker @gitzone/npmts ts-node
\ No newline at end of file
diff --git a/test/test_latest.sh b/test/test_latest.sh
index 07e3405..820f993 100644
--- a/test/test_latest.sh
+++ b/test/test_latest.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-yarn -v
+npm -v
diff --git a/test/test_npmci.sh b/test/test_npmci.sh
index e1331af..4b120e9 100644
--- a/test/test_npmci.sh
+++ b/test/test_npmci.sh
@@ -4,6 +4,6 @@ npmci -v
 # check if we can use lts
 npmci install lts
 
-# check if yarn picks it up
-npmci command yarn global add npmts
+# check if npm picks it up
+npmci command npm install -g npmts
 npmci command npmts -v
diff --git a/test/test_stable.sh b/test/test_stable.sh
index 96e0b46..0321599 100644
--- a/test/test_stable.sh
+++ b/test/test_stable.sh
@@ -1,3 +1,3 @@
-# test yarn
-yarn global add npmts
+# npm
+npm install -g npmts
 npmts -v
\ No newline at end of file