diff options
author | Andrew Newdigate <andrew@gitlab.com> | 2017-12-18 19:13:29 +0300 |
---|---|---|
committer | Andrew Newdigate <andrew@gitlab.com> | 2017-12-18 22:56:15 +0300 |
commit | e2c9513ca621185b720e3dccdf3d04d969d83f7c (patch) | |
tree | 62a33b103efa06301ae3722301ad004c270aa094 /_support | |
parent | ced5ca6eb8654662045f84cef17d66ff68006b8f (diff) |
Go 1.9 build
Diffstat (limited to '_support')
4 files changed, 11 insertions, 30 deletions
diff --git a/_support/build-images/ruby-2.3-golang-1.8-git-2.13/Dockerfile b/_support/build-images/ruby-2.3-golang-1.8-git-2.13/Dockerfile deleted file mode 100644 index 04acdfb79..000000000 --- a/_support/build-images/ruby-2.3-golang-1.8-git-2.13/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8-git-2.13 - -RUN mkdir -p /bundle-cache - -COPY Gemfile /bundle-cache -COPY Gemfile.lock /bundle-cache - -RUN apt-get update -qq && \ - apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ - cd /bundle-cache && bundle install --path vendor/bundle diff --git a/_support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile b/_support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile deleted file mode 100644 index 2844a8a07..000000000 --- a/_support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8-git-2.14 - -RUN mkdir -p /bundle-cache - -COPY Gemfile /bundle-cache -COPY Gemfile.lock /bundle-cache - -RUN apt-get update -qq && \ - apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ - cd /bundle-cache && bundle install --path vendor/bundle diff --git a/_support/build-images/ruby-2.3-golang-1.8-git-2.8/Dockerfile b/_support/build-images/ruby-2.3-golang-1.8-git-2.8/Dockerfile deleted file mode 100644 index 0c1422c3c..000000000 --- a/_support/build-images/ruby-2.3-golang-1.8-git-2.8/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8-git-2.8 - -RUN mkdir -p /bundle-cache - -COPY Gemfile /bundle-cache -COPY Gemfile.lock /bundle-cache - -RUN apt-get update -qq && \ - apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ - cd /bundle-cache && bundle install --path vendor/bundle diff --git a/_support/build-images/versioned/Dockerfile b/_support/build-images/versioned/Dockerfile new file mode 100644 index 000000000..856f92aa5 --- /dev/null +++ b/_support/build-images/versioned/Dockerfile @@ -0,0 +1,11 @@ +ARG CUSTOM_IMAGE_VERSION +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:${CUSTOM_IMAGE_VERSION} + +RUN mkdir -p /bundle-cache + +COPY Gemfile /bundle-cache +COPY Gemfile.lock /bundle-cache + +RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \ + DEBIAN_FRONTEND=noninteractive apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ + cd /bundle-cache && bundle install --path vendor/bundle |