NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rm-doc-gitlab-com' into 'master'

Browse source 
Remove doc-gitlab-com image, not used anymore

See merge request !50
This commit is contained in:
Achilleas Pipinellis 2017-09-04 19:19:12 +00:00
commit 19e61d7d15
3 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -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 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 www-gitlab-com test: *test_build
doc-gitlab-com test: *test_build
gitlab-qa test: *test_build gitlab-qa test: *test_build
omnibus-gitlab-centos6 test: *test_build omnibus-gitlab-centos6 test: *test_build
omnibus-gitlab-centos7 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 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 www-gitlab-com: *build_and_deploy
doc-gitlab-com: *build_and_deploy
gitlab-qa: *build_and_deploy gitlab-qa: *build_and_deploy
omnibus-gitlab-centos6: *build_and_deploy omnibus-gitlab-centos6: *build_and_deploy
omnibus-gitlab-centos7: *build_and_deploy omnibus-gitlab-centos7: *build_and_deploy

12
Dockerfile.doc-gitlab-com
View file

@ -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

17
scripts/install-doc-gitlab-com
View file

@ -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/*