Skip to content
Snippets Groups Projects
Commit 4b207a0c authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'add-yarn-build-dependancy' into 'master' 

Add Yarn as a build dependency

Closes #6

See merge request !30
parents d8ecd320 4d6ea977
No related branches found
No related tags found
1 merge request!30Add Yarn as a build dependency
Hide whitespace changes
Inline Side-by-side
Showing
with 81 additions and 16 deletions
docker/Dockerfile_centos6
+ 6
− 0
View file @ 4b207a0c
@@ -72,6 +72,12 @@ RUN RPM_TMP=$(mktemp) \
&& rm -f '${RPM_TMP}' \
&& yum install -y -q nodejs-${NODE_VERSION}
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_centos7
+ 6
− 0
View file @ 4b207a0c
@@ -72,6 +72,12 @@ RUN RPM_TMP=$(mktemp) \
&& rm -f '${RPM_TMP}' \
&& yum install -y -q nodejs-${NODE_VERSION}
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_jessie
+ 8
− 2
View file @ 4b207a0c
@@ -2,8 +2,8 @@ FROM debian:jessie
MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -76,6 +76,12 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_opensuse13.2
+ 7
− 2
View file @ 4b207a0c
@@ -36,8 +36,7 @@ RUN zypper -q -n install \
python-setuptools \
timezone \
rpmbuild \
ccache \
distcc
ccache
 
# perl-devel python-setuptools-devel
 
@@ -79,6 +78,12 @@ RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no
ENV NODE_VERSION 6.9.3
RUN zypper -q -n in nodejs6-${NODE_VERSION} npm6-${NODE_VERSION}
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_opensuse42.1
+ 6
− 0
View file @ 4b207a0c
@@ -79,6 +79,12 @@ RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no
ENV NODE_VERSION 6.9.5
RUN zypper -q -n in nodejs6-${NODE_VERSION} npm6-${NODE_VERSION}
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_precise
+ 8
− 2
View file @ 4b207a0c
@@ -2,8 +2,8 @@ FROM ubuntu:precise
MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -78,6 +78,12 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_rpi_jessie
+ 8
− 2
View file @ 4b207a0c
@@ -12,8 +12,8 @@ COPY arm/sh-shim /usr/bin
RUN [ "cross-build-start" ]
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -87,6 +87,12 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_rpi_wheezy
+ 8
− 2
View file @ 4b207a0c
@@ -12,8 +12,8 @@ COPY arm/sh-shim /usr/bin
RUN [ "cross-build-start" ]
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -87,6 +87,12 @@ RUN curl -fsSL "https://nodejs.org/dist/latest-v6.x/node-v${NODE_VERSION}-linux-
| tar -xzC /usr/local \
&& ln -sf /usr/local/node-v${NODE_VERSION}-linux-armv6l/bin/node /usr/local/node-v${NODE_VERSION}-linux-armv6l/bin/npm /usr/local/bin/
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_trusty
+ 8
− 2
View file @ 4b207a0c
@@ -2,8 +2,8 @@ FROM ubuntu:trusty
MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -76,6 +76,12 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_wheezy
+ 8
− 2
View file @ 4b207a0c
@@ -2,8 +2,8 @@ FROM debian:wheezy
MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -76,6 +76,12 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_xenial
+ 8
− 2
View file @ 4b207a0c
@@ -2,8 +2,8 @@ FROM ubuntu:xenial
MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
build-essential \
zlib1g-dev \
byacc \
@@ -77,6 +77,12 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
 
ENV YARN_VERSION 0.20.3
RUN mkdir /usr/local/yarn \
&& curl -fsSL "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" \
| tar -xzC /usr/local/yarn --strip 1 \
&& ln -sf /usr/local/yarn/bin/yarn /usr/local/bin/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment