mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Merge branch 'support-ubuntu-18.04' into 'master'
Support ubuntu 18.04 See merge request gitlab-org/gitlab-build-images!85
This commit is contained in:
commit
e1b4518940
2 changed files with 25 additions and 0 deletions
|
|
@ -82,6 +82,7 @@ omnibus-gitlab-opensuse42.3 test: *test_build
|
|||
omnibus-gitlab-trusty test: *test_build
|
||||
omnibus-gitlab-wheezy test: *test_build
|
||||
omnibus-gitlab-xenial test: *test_build
|
||||
omnibus-gitlab-bionic test: *test_build
|
||||
sitespeed-gitlab test: *test_build
|
||||
|
||||
# Builds
|
||||
|
|
@ -116,6 +117,7 @@ omnibus-gitlab-opensuse42.3: *build_and_deploy
|
|||
omnibus-gitlab-trusty: *build_and_deploy
|
||||
omnibus-gitlab-wheezy: *build_and_deploy
|
||||
omnibus-gitlab-xenial: *build_and_deploy
|
||||
omnibus-gitlab-bionic: *build_and_deploy
|
||||
sitespeed-gitlab: *build_and_deploy
|
||||
|
||||
cache-google-chrome:
|
||||
|
|
|
|||
23
Dockerfile.omnibus-gitlab-bionic
Normal file
23
Dockerfile.omnibus-gitlab-bionic
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
FROM ubuntu:18.04
|
||||
|
||||
RUN apt-get update -q \
|
||||
&& apt-get install -y g++-6 gcc-6 git make curl zlib1g-dev libssl1.0-dev locales \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
|
||||
RUN locale-gen en_US.UTF-8
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LANGUAGE en_US:en
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
ENV CC /usr/bin/gcc-6
|
||||
ENV CXX /usr/bin/g++-6
|
||||
|
||||
ENV RUBY_VERSION 2.3.3
|
||||
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
|
||||
| tar -xzC /tmp \
|
||||
&& cd /tmp/ruby-2.3.3 \
|
||||
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
|
||||
&& make \
|
||||
&& make install
|
||||
|
||||
RUN gem install bundler
|
||||
Loading…
Add table
Add a link
Reference in a new issue