From 88c5adb85d70b9017ed66331b4508322a8f41419 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 13 Sep 2016 10:51:51 +0200 Subject: [PATCH 1/2] Add image for doc-gitlab-com --- Dockerfile.doc-gitlab-com | 12 ++++++++++++ scripts/install-doc-gitlab-com | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 Dockerfile.doc-gitlab-com create mode 100755 scripts/install-doc-gitlab-com diff --git a/Dockerfile.doc-gitlab-com b/Dockerfile.doc-gitlab-com new file mode 100644 index 0000000..9b68137 --- /dev/null +++ b/Dockerfile.doc-gitlab-com @@ -0,0 +1,12 @@ +FROM ruby:2.3-slim + +ENV PACKAGES="git-core pandoc locales" + +ADD / / +RUN /scripts/install-doc-gitlab-com + +# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ +# Must be set after install-essentials is run +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 diff --git a/scripts/install-doc-gitlab-com b/scripts/install-doc-gitlab-com new file mode 100755 index 0000000..8853b7f --- /dev/null +++ b/scripts/install-doc-gitlab-com @@ -0,0 +1,17 @@ +#!/bin/bash + +set -xeo pipefail + +apt-get update +apt-get install -yq --no-install-recommends \ + $PACKAGES + +apt-get autoremove -yq + +# Set UTF-8 +echo "en_US.UTF-8 UTF-8" > /etc/locale.gen +locale-gen +update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=en_US.UTF-8 +locale -a + +rm -rf /var/lib/apt/lists/* From 72fb34322b62ff47e94e6e3e0cc9e36a5364bb8b Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 13 Sep 2016 10:57:59 +0200 Subject: [PATCH 2/2] Add jobs to .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c0d8ae..8bc8524 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,8 +31,10 @@ ruby-2.1 test: *test_build ruby-2.2 test: *test_build ruby-2.3 test: *test_build www-gitlab-com test: *test_build +doc-gitlab-com test: *test_build ruby-2.1: *build_and_deploy ruby-2.2: *build_and_deploy ruby-2.3: *build_and_deploy www-gitlab-com: *build_and_deploy +doc-gitlab-com: *build_and_deploy