Merge branch 'versioned-images' into 'master'

Version build images

See merge request !36

.gitlab-ci.yml

@@ -17,42 +17,38 @@ before_script:
     - set -- $CI_BUILD_NAME
     - cd docker && docker build -f "Dockerfile_$1" .
   except:
-    - master
+    - tags
 .build_and_deploy: &build_and_deploy
   stage: build
   script:
-    - cd docker && docker build -t "$CI_REGISTRY_IMAGE:$CI_BUILD_NAME" -f "Dockerfile_$CI_BUILD_NAME" .
+    - cd docker && docker build -t "$CI_REGISTRY_IMAGE:$CI_BUILD_NAME-$CI_COMMIT_TAG" -f "Dockerfile_$CI_BUILD_NAME" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_NAME"
   only:
-    - master
-wheezy test: *test_build
-centos7 test: *test_build
-precise test: *test_build
-rpi_wheezy test: *test_build
-wheezy test: *test_build
-centos6 test: *test_build
-jessie test: *test_build
-rpi_jessie test: *test_build
-trusty test: *test_build
-xenial test: *test_build
-opensuse13.2 test: *test_build
-opensuse42.1 test: *test_build
+    - tags
+debian_7 test: *test_build
+debian_8 test: *test_build
+centos_6 test: *test_build
+centos_7 test: *test_build
+ubuntu_12.04 test: *test_build
+ubuntu_14.04 test: *test_build
+ubuntu_16.04 test: *test_build
+opensuse_13.2 test: *test_build
+opensuse_42.1 test: *test_build
+rpi_8 test: *test_build
 jessie_packer test: *test_build
 ruby_docker test: *test_build
-wheezy: *build_and_deploy
-centos7: *build_and_deploy
-precise: *build_and_deploy
-rpi_wheezy: *build_and_deploy
-wheezy: *build_and_deploy
-centos6: *build_and_deploy
-jessie: *build_and_deploy
-rpi_jessie: *build_and_deploy
-trusty: *build_and_deploy
-xenial: *build_and_deploy
-opensuse13.2: *build_and_deploy
-opensuse42.1: *build_and_deploy
+debian_7: *build_and_deploy
+debian_8: *build_and_deploy
+centos_6: *build_and_deploy
+centos_7: *build_and_deploy
+ubuntu_12.04: *build_and_deploy
+ubuntu_14.04: *build_and_deploy
+ubuntu_16.04: *build_and_deploy
+opensuse_13.2: *build_and_deploy
+opensuse_42.1: *build_and_deploy
+rpi_8: *build_and_deploy
 jessie_packer: *build_and_deploy
 ruby_docker: *build_and_deploy

docker/Dockerfile_centos6 → docker/Dockerfile_centos_6

@@ -67,11 +67,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_centos7 → docker/Dockerfile_centos_7

@@ -67,11 +67,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_wheezy → docker/Dockerfile_debian_7

@@ -71,11 +71,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_jessie → docker/Dockerfile_debian_8

@@ -71,11 +71,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_opensuse13.2 → docker/Dockerfile_opensuse_13.2

@@ -3,7 +3,6 @@ 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
@@ -77,7 +76,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_opensuse42.1 → docker/Dockerfile_opensuse_42.1

@@ -2,8 +2,7 @@ FROM opensuse:42.1
 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 addrepo http://download.opensuse.org/repositories/devel:/tools/openSUSE_Leap_42.1/ develtools
 RUN zypper -q -n --gpg-auto-import-keys update
 #RUN yum groupinstall -y Development Tools
 #RUN yum install -y epel-release
@@ -78,7 +77,8 @@ 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 zypper -q -n in nodejs6-${NODE_VERSION} npm6-${NODE_VERSION}
+RUN curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_rpi_wheezy → docker/Dockerfile_rpi_8

-FROM resin/rpi-raspbian:wheezy
+FROM resin/rpi-raspbian:jessie
 MAINTAINER GitLab Inc. <support@gitlab.com>
 # Prepare emulation scripts
@@ -21,8 +21,6 @@ RUN apt-get update -q \
       python-pip \
       git \
       gcc \
-      gcc-4.8\
-      libstdc++-4.8-pic\
       libssl-dev \
       libyaml-dev \
       libffi-dev \
@@ -84,9 +82,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-armv6l.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_rpi_jessie

-FROM resin/rpi-raspbian:jessie
-MAINTAINER GitLab Inc. <support@gitlab.com>
-
-# Prepare emulation scripts
-# As seen on https://github.com/resin-io-projects/armv7hf-debian-qemu
-ENV QEMU_EXECVE 1
-COPY arm/cross-build-end /usr/bin
-COPY arm/cross-build-start /usr/bin
-COPY arm/qemu-arm-static /usr/bin
-COPY arm/sh-shim /usr/bin
-
-RUN [ "cross-build-start" ]
-
-# Install required packages
-RUN apt-get update -q \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
-      build-essential \
-      zlib1g-dev \
-      byacc \
-      cmake \
-      python-pip \
-      git \
-      gcc \
-      libssl-dev \
-      libyaml-dev \
-      libffi-dev \
-      libreadline-dev \
-      libgdbm-dev \
-      libncurses5-dev \
-      make \
-      bzip2 \
-      curl \
-      ca-certificates \
-      locales \
-      openssh-server \
-      libcurl4-openssl-dev \
-      libexpat1-dev \
-      gettext \
-      libz-dev \
-      libssl-dev \
-      fakeroot \
-      python-dev \
-      ccache \
-      distcc \
-      unzip \
-      apt-transport-https
-
-RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-RUN pip install awscli
-
-ENV GIT_VERSION 2.7.4
-RUN curl -fsSL "https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz" \
-	| tar -xzC /tmp \
-  && cd /tmp/git-2.7.4 \
-  && ls -la \
-  && ./configure \
-  && make all \
-  && make install
-
-ENV GO_VERSION 1.6.2
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
-	| tar -xzC /usr/local \
-  && ln -sf /usr/local/go/bin/go /usr/local/go/bin/gofmt /usr/local/go/bin/godoc /usr/local/bin/
-
-ENV RUBY_VERSION 2.3.3
-RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
-  | tar -xzC /tmp \
-  && cd /tmp/ruby-2.3.3 \
-  && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
-  && make \
-  && make install
-
-ENV RUBYGEMS_VERSION 2.6.8
-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}-*
-
-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"
-RUN git config --global user.name "GitLab Inc."
-
-RUN rm -rf /tmp/*
-
-RUN [ "cross-build-end" ]

docker/Dockerfile_precise → docker/Dockerfile_ubuntu_12.04

@@ -73,11 +73,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_trusty → docker/Dockerfile_ubuntu_14.04

@@ -71,11 +71,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \

docker/Dockerfile_xenial → docker/Dockerfile_ubuntu_16.04

@@ -72,11 +72,8 @@ 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 curl -fsSL "https://nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" \
+  | tar --strip-components 1 -xzC /usr/local/
 ENV YARN_VERSION 0.20.3
 RUN mkdir /usr/local/yarn \