Merge branch 'jerasmus-master-patch-33196' into 'master'

Fix node and yarn installation

See merge request gitlab-org/gitlab-build-images!229
This commit is contained in:
Rémy Coutable 2019-10-02 10:07:40 +00:00
commit e77f4d79fc

View file

@ -1,23 +1,15 @@
FROM ruby:2.6.3-alpine3.10 FROM ruby:2.6.3-alpine3.10
MAINTAINER GitLab Documentation Team 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_VERSION="1.19.0"
ENV YARN_ARCHIVE_FILE="yarn-v${YARN_VERSION}.tar.gz" ENV YARN_ARCHIVE_FILE="yarn-v${YARN_VERSION}.tar.gz"
ENV YARN_URL="https://yarnpkg.com/downloads/${YARN_VERSION}/${YARN_ARCHIVE_FILE}" ENV YARN_URL="https://yarnpkg.com/downloads/${YARN_VERSION}/${YARN_ARCHIVE_FILE}"
ENV PATH $PATH:/yarn-v${YARN_VERSION}/bin
# Install dependencies # 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 && 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 # Install Yarn
RUN wget "${YARN_URL}" \ RUN wget "${YARN_URL}" \
&& wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --import \ && wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --import \