From 55d7b086a5f07d766773d3d5e2bcf0c6440e83a3 Mon Sep 17 00:00:00 2001
From: Jacques Erasmus <jerasmus@gitlab.com>
Date: Wed, 2 Oct 2019 10:07:40 +0000
Subject: [PATCH] Fix node and yarn installation

---
 Dockerfile.gitlab-docs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.gitlab-docs b/Dockerfile.gitlab-docs
index e7d931f..367fa87 100644
--- a/Dockerfile.gitlab-docs
+++ b/Dockerfile.gitlab-docs
@@ -1,23 +1,15 @@
 FROM ruby:2.6.3-alpine3.10
 MAINTAINER GitLab Documentation Team
 
-ENV NODE_VERSION="12.11.0"
-ENV NODE_ARCHIVE_FILE="node-v${NODE_VERSION}-linux-x64.tar.xz"
-ENV NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/${NODE_ARCHIVE_FILE}"
-
 ENV YARN_VERSION="1.19.0"
 ENV YARN_ARCHIVE_FILE="yarn-v${YARN_VERSION}.tar.gz"
 ENV YARN_URL="https://yarnpkg.com/downloads/${YARN_VERSION}/${YARN_ARCHIVE_FILE}"
+ENV PATH $PATH:/yarn-v${YARN_VERSION}/bin
 
 # Install dependencies
-RUN apk --no-cache add -U openssl tar gzip xz gnupg bash \
+RUN apk --no-cache add -U openssl tar gzip xz gnupg bash nodejs \
   && mkdir -p /opt
 
-# Install NodeJS
-RUN mkdir -p /usr/local/lib/nodejs \
-  && wget "${NODE_URL}" \
-  && tar -xvf "${NODE_ARCHIVE_FILE}" -C /usr/local/lib/nodejs
-
 # Install Yarn
 RUN wget "${YARN_URL}" \
   && wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --import \