diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5d85c5..a719c5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,6 @@ golang-1.8-git-2.13 test: *test_custom ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6 test: *test_build www-gitlab-com test: *test_build -doc-gitlab-com test: *test_build gitlab-qa test: *test_build omnibus-gitlab-centos6 test: *test_build omnibus-gitlab-centos7 test: *test_build @@ -92,7 +91,6 @@ golang-1.8-git-2.13: *build_and_deploy_custom ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6: *build_and_deploy www-gitlab-com: *build_and_deploy -doc-gitlab-com: *build_and_deploy gitlab-qa: *build_and_deploy omnibus-gitlab-centos6: *build_and_deploy omnibus-gitlab-centos7: *build_and_deploy diff --git a/Dockerfile.doc-gitlab-com b/Dockerfile.doc-gitlab-com deleted file mode 100644 index 9b68137..0000000 --- a/Dockerfile.doc-gitlab-com +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100755 index 8853b7f..0000000 --- a/scripts/install-doc-gitlab-com +++ /dev/null @@ -1,17 +0,0 @@ -#!/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/*