Merge branch 'master' into sh-add-rsync-www-gitlab-com

.gitlab-ci.yml

@@ -59,7 +59,9 @@ ruby-2.5-golang-1.11-git-2.18 test: *test_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
 ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
 
 # Not used anymore (?)
 golang-1.9-git-2.9.0 test: *test_custom
@@ -105,7 +107,9 @@ ruby-2.5-golang-1.11-git-2.18: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
 ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
 
 # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
 node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom

Dockerfile.gitlab-puppeteer

@@ -1,4 +1,6 @@
-FROM node:10-jessie
+FROM node:10-stretch
+
+ADD /scripts/ /scripts/
 
 # Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
 RUN apt-get update \
@@ -10,3 +12,5 @@ RUN apt-get update \
   && apt-get autoremove -yq \
   && apt-get clean -yqq \
   && rm -rf /var/lib/apt/lists/*
+
+RUN /scripts/install-noto-emoji

Dockerfile.gitlab-qa

@@ -2,7 +2,7 @@ FROM ruby:2.4
 
 WORKDIR /home/qa
 
-RUN wget -q http://get.docker.com.s3.amazonaws.com/builds/Linux/x86_64/docker-1.12.1.tgz && \
+RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz && \
-    tar -zxf docker-1.12.1.tgz && mv docker/docker /usr/local/bin/docker && \
+    tar -zxf docker-18.06.1-ce.tgz && mv docker/docker /usr/local/bin/docker && \
-    echo "0c6b9b39a87a82794f7165ce85860bacd7454171cd034f913b95e60f542716f0  /usr/local/bin/docker" | sha256sum -c - && \
+    echo "2d92728714d794f78619785a2c638b58b0b15e60b340de51886bf6d3730f31f0  /usr/local/bin/docker" | sha256sum -c - && \
-    rm docker-1.12.1.tgz
+    rm docker-18.06.1-ce.tgz

Dockerfile.www-gitlab-com-2.4

@@ -1,16 +1,8 @@
 FROM ruby:2.4-slim
 
-ADD / /
+ADD /scripts/ /scripts/
 RUN /scripts/install-www-gitlab-com
 
-# NodeJS and Yarn
-ARG NODE_INSTALL_VERSION=8.x
-ARG YARN_INSTALL_VERSION=1.2.1-1
-RUN /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
-
-ADD https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
-RUN chmod +x /usr/bin/gitlab-runner-helper
-
 # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
 # Must be set after install-essentials is run
 ENV LANG en_US.UTF-8

scripts/custom-docker-build

@@ -126,6 +126,7 @@ function print_node_args() {
     case "$1" in
         7.x|7.1) NODE_INSTALL_VERSION=7.x ;;
         8.x) NODE_INSTALL_VERSION=8.x ;;
+        10.x) NODE_INSTALL_VERSION=10.x ;;
         *) echo "Unknown node version $1"; exit 1;
     esac
     printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"
@@ -135,6 +136,7 @@ function print_yarn_args() {
     case "$1" in
         1.0) YARN_INSTALL_VERSION=1.0.2-1 ;;
         1.2) YARN_INSTALL_VERSION=1.2.1-1 ;;
+        1.12) YARN_INSTALL_VERSION=1.12.3-1 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
     printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"

scripts/install-noto-emoji

@@ -0,0 +1,42 @@
+#!/bin/bash
+# This script installs noto color emoji
+
+apt-get update
+apt-get install unzip
+
+cat > ~/.fonts.conf << EOM
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Noto Color Emoji</string>
+    </test>
+    <edit name="scalable" mode="assign"><bool>true</bool></edit>
+  </match>
+  <match target="pattern">
+    <test name="prgname">
+      <string>chrome</string>
+    </test>
+    <edit name="family" mode="prepend_first">
+      <string>Noto Color Emoji</string>
+    </edit>
+  </match>
+</fontconfig>
+EOM
+
+mkdir setup_fonts
+cd setup_fonts
+curl https://noto-website-2.storage.googleapis.com/pkgs/NotoColorEmoji-unhinted.zip -LO
+unzip NotoColorEmoji-unhinted.zip
+
+mkdir -p /usr/local/share/fonts
+cp NotoColorEmoji.ttf /usr/local/share/fonts/
+ls -la /usr/local/share/fonts/
+chmod 644 /usr/local/share/fonts/NotoColorEmoji.ttf
+
+fc-cache -fv
+
+cd ..
+rm -r setup_fonts
+apt-get clean -yqq && rm -rf /var/lib/apt/lists/*

scripts/install-www-gitlab-com

@@ -5,19 +5,32 @@ IFS=$'\n\t'
 
 export DEBIAN_FRONTEND=noninteractive
 
+# Install LaTeX and pandoc 2.3.1
 apt-get update
 apt-get install -yq --no-install-recommends \
   make gcc g++ locales \
-  git-core texlive-latex-recommended texlive-xetex \
+  rsync git-core texlive-latex-recommended texlive-xetex \
-  texlive-fonts-recommended lmodern ed file curl gnupg2 rsync
+  texlive-fonts-recommended lmodern ed file curl gnupg2 \
 
-# Install pandoc v2.3.1
 cd /tmp
 curl -L -O https://github.com/jgm/pandoc/releases/download/2.3.1/pandoc-2.3.1-linux.tar.gz
 tar xvf pandoc-2.3.1-linux.tar.gz
 cp pandoc-2.3.1/bin/* /usr/local/bin
 rm -rf /tmp/pandoc*
 
+# For cropping the pictures on the team page
+apt-get install -yq --no-install-recommends imagemagick
+
+# Installing node & yarn
+NODE_INSTALL_VERSION=8.x
+YARN_INSTALL_VERSION=1.2.1-1
+/scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
+
+# Installing gitlab-runner
+curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64
+mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
+chmod +x /usr/bin/gitlab-runner-helper
+
 # Set UTF-8
 echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
 locale-gen