From 33f900fd3661ce4fcc46f7449a765455d01f3214 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 7 Jun 2019 15:17:13 +0100
Subject: [PATCH] Add a Ruby 2.6 image for www-gitlab-com

Ruby 2.5 will be needed by Middleman 5.
---
 .gitlab-ci.yml                |  2 ++
 Dockerfile.www-gitlab-com-2.6 | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 Dockerfile.www-gitlab-com-2.6

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10eb9c4..ebe8982 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,6 +94,7 @@ omnibus-gitlab-depscan test: *test_build
 release-tools test: *test_build
 sitespeed-gitlab test: *test_build
 www-gitlab-com-2.4 test: *test_build
+www-gitlab-com-2.6 test: *test_build
 gitlab-docs-lint test: *test_build
 
 # Builds
@@ -140,6 +141,7 @@ omnibus-gitlab-depscan: *build_and_deploy
 release-tools: *build_and_deploy
 sitespeed-gitlab: *build_and_deploy
 www-gitlab-com-2.4: *build_and_deploy
+www-gitlab-com-2.6: *build_and_deploy
 gitlab-docs-lint: *build_and_deploy
 
 cache-google-chrome:
diff --git a/Dockerfile.www-gitlab-com-2.6 b/Dockerfile.www-gitlab-com-2.6
new file mode 100644
index 0000000..7ff8167
--- /dev/null
+++ b/Dockerfile.www-gitlab-com-2.6
@@ -0,0 +1,10 @@
+FROM ruby:2.6-slim
+
+ADD /scripts/ /scripts/
+RUN /scripts/install-www-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