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

Merge branch 'add-2-5-gitlab-com-image' into 'master'

Browse source 
Add a Ruby 2.6 image for www-gitlab-com

See merge request gitlab-org/gitlab-build-images!194
This commit is contained in:
Stan Hu 2019-06-07 15:51:24 +00:00
commit 4a0bd9438f
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

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

10
Dockerfile.www-gitlab-com-2.6 Normal file
View file

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