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

Merge branch 'master' into 'fix-orphaned-commit' 

# Conflicts:
#   docker/Dockerfile_jessie
#   docker/Dockerfile_precise
#   docker/Dockerfile_rpi_jessie
#   docker/Dockerfile_rpi_wheezy
#   docker/Dockerfile_trusty
#   docker/Dockerfile_wheezy
#   docker/Dockerfile_xenial
parents b3ba96b9 7fcb2324
No related branches found
No related tags found
1 merge request!27Restores lost changes when mirror force pushed onto dev
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 9 deletions
.gitlab-ci.yml
+ 2
− 2
View file @ 3a759032
@@ -37,8 +37,8 @@ jessie test: *test_build
rpi_jessie test: *test_build
trusty test: *test_build
xenial test: *test_build
opensuse13.2: *test_build
opensuse42.1: *test_build
opensuse13.2 test: *test_build
opensuse42.1 test: *test_build
 
wheezy: *build_and_deploy
centos7: *build_and_deploy
docker/Dockerfile_centos6
+ 7
− 0
View file @ 3a759032
@@ -65,6 +65,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN RPM_TMP=$(mktemp) \
&& curl -sL -o '${RPM_TMP}' 'https://rpm.nodesource.com/pub_6.x/el/6/x86_64/nodesource-release-el6-1.noarch.rpm' \
&& rpm -i --nosignature --force '${RPM_TMP}' \
&& rm -f '${RPM_TMP}' \
&& yum install -y -q nodejs-${NODE_VERSION}
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_centos7
+ 7
− 0
View file @ 3a759032
@@ -65,6 +65,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN RPM_TMP=$(mktemp) \
&& curl -sL -o '${RPM_TMP}' 'https://rpm.nodesource.com/pub_6.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm' \
&& rpm -i --nosignature --force '${RPM_TMP}' \
&& rm -f '${RPM_TMP}' \
&& yum install -y -q nodejs-${NODE_VERSION}
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_jessie
+ 9
− 1
View file @ 3a759032
@@ -31,7 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -68,6 +69,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_6.x jessie main' > /etc/apt/sources.list.d/nodesource.list \
&& echo 'deb-src https://deb.nodesource.com/node_6.x jessie main' >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_opensuse13.2
+ 4
− 0
View file @ 3a759032
@@ -3,6 +3,7 @@ MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN zypper addrepo http://download.opensuse.org/repositories/devel:/tools/openSUSE_13.2/ develtools
RUN zypper addrepo http://download.opensuse.org/repositories/devel:/languages:/nodejs/openSUSE_13.2/ NodeJSBuildService
RUN zypper -q -n --gpg-auto-import-keys update
#RUN yum groupinstall -y Development Tools
#RUN yum install -y epel-release
@@ -75,6 +76,9 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.3
RUN zypper -q -n in nodejs6-${NODE_VERSION} npm6-${NODE_VERSION}
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_opensuse42.1
+ 4
− 0
View file @ 3a759032
@@ -3,6 +3,7 @@ MAINTAINER GitLab Inc. <support@gitlab.com>
 
# Install required packages
RUN zypper addrepo http://download.opensuse.org/repositories/devel:/tools/openSUSE_13.2/ develtools
RUN zypper addrepo http://download.opensuse.org/repositories/devel:/languages:/nodejs/openSUSE_Leap_42.1/ NodeJSBuildService
RUN zypper -q -n --gpg-auto-import-keys update
#RUN yum groupinstall -y Development Tools
#RUN yum install -y epel-release
@@ -75,6 +76,9 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.3
RUN zypper -q -n in nodejs6-${NODE_VERSION} npm6-${NODE_VERSION}
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_precise
+ 10
− 1
View file @ 3a759032
@@ -31,7 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -39,6 +40,7 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
 
RUN pip install -U pip
RUN pip install -U setuptools
RUN pip install awscli
 
@@ -69,6 +71,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_6.x precise main' > /etc/apt/sources.list.d/nodesource.list \
&& echo 'deb-src https://deb.nodesource.com/node_6.x precise main' >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_rpi_jessie
+ 9
− 1
View file @ 3a759032
@@ -41,7 +41,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -79,6 +80,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_6.x jessie main' > /etc/apt/sources.list.d/nodesource.list \
&& echo 'deb-src https://deb.nodesource.com/node_6.x jessie main' >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_rpi_wheezy
+ 7
− 1
View file @ 3a759032
@@ -41,7 +41,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -79,6 +80,11 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -fsSL "https://nodejs.org/dist/latest-v6.x/node-v${NODE_VERSION}-linux-armv6l.tar.gz" \
| 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/
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_trusty
+ 9
− 1
View file @ 3a759032
@@ -31,7 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -68,6 +69,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_6.x trusty main' > /etc/apt/sources.list.d/nodesource.list \
&& echo 'deb-src https://deb.nodesource.com/node_6.x trusty main' >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_wheezy
+ 9
− 1
View file @ 3a759032
@@ -31,7 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
fakeroot \
python-dev \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -68,6 +69,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_6.x wheezy main' > /etc/apt/sources.list.d/nodesource.list \
&& echo 'deb-src https://deb.nodesource.com/node_6.x wheezy main' >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh
 
RUN git config --global user.email "packages@gitlab.com"
docker/Dockerfile_xenial
+ 9
− 1
View file @ 3a759032
@@ -32,7 +32,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
python-dev \
python-setuptools \
ccache \
distcc
distcc \
apt-transport-https
 
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
RUN locale-gen en_US.UTF-8
@@ -69,6 +70,13 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
ENV BUNDLER_VERSION 1.13.6
RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
 
ENV NODE_VERSION 6.9.5
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_6.x xenial main' > /etc/apt/sources.list.d/nodesource.list \
&& echo 'deb-src https://deb.nodesource.com/node_6.x xenial main' >> /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
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