diff --git a/Dockerfile b/Dockerfile index 384c7dd..f2adece 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ ENV CONFIG_FLAGS="--fully-static" DEL_PKGS="libgcc libstdc++" RM_DIRS=/usr/inclu RUN apk add --no-cache ca-certificates bash curl make gcc g++ python linux-headers paxctl libgcc libstdc++ gnupg && \ update-ca-certificates && \ + curl -o- -L https://yarnpkg.com/install.sh | sh \ && gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B && \ gpg --keyserver pool.sks-keyservers.net --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 && \ gpg --keyserver pool.sks-keyservers.net --recv-keys 0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 && \ @@ -36,5 +37,6 @@ RUN apk add --no-cache ca-certificates bash curl make gcc g++ python linux-heade rm -rf /node-${VERSION}.tar.gz /SHASUMS256.txt.asc /node-${VERSION} ${RM_DIRS} \ /usr/share/man /tmp/* /var/cache/apk/* /root/.npm /root/.node-gyp /root/.gnupg \ /usr/lib/node_modules/npm/man /usr/lib/node_modules/npm/doc /usr/lib/node_modules/npm/html - -RUN npm install -g npmci \ No newline at end of file + +ENV PATH /root/.yarn/bin:$PATH +RUN npm install -g npmci diff --git a/Dockerfile_npmg b/Dockerfile_npmci similarity index 62% rename from Dockerfile_npmg rename to Dockerfile_npmci index 7c2b5d4..91f7078 100644 --- a/Dockerfile_npmg +++ b/Dockerfile_npmci @@ -1,2 +1 @@ FROM hosttoday/ht-docker-dbase:latest -RUN npm install -g npmg \ No newline at end of file diff --git a/Dockerfile_npmts b/Dockerfile_npmts deleted file mode 100644 index fafe611..0000000 --- a/Dockerfile_npmts +++ /dev/null @@ -1,3 +0,0 @@ -FROM hosttoday/ht-docker-dbase:latest -RUN npm install -g npmts -RUN npm install -g npmdocker \ No newline at end of file