diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2018-01-31 21:27:45 +0300 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2018-01-31 21:37:38 +0300 |
| commit | 475da07193bd8a5683397da4d3f60b5d2fe14215 (patch) | |
| tree | 0767c5230ad3213b140f615bb18b7cbfb79da118 | |
| parent | f641595bedb168e0610da9451386a445e0820d6d (diff) | |
Let's give this a shotmeh
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | _support/build-images/versioned/Dockerfile | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b267e05a..95c8c6533 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,8 +130,9 @@ codequality: script: - mkdir -p _support/build-images/$CI_JOB_NAME/ - cp ruby/Gemfile ruby/Gemfile.lock _support/build-images/$CI_JOB_NAME/ + - cp _support/build-images/versioned/Dockerfile _support/build-images/$CI_JOB_NAME/ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - - docker build -t registry.gitlab.com/gitlab-org/gitaly/build-$CI_JOB_NAME:latest --build-arg CUSTOM_IMAGE_VERSION=$CI_JOB_NAME _support/build-images/versioned/ + - docker build -t registry.gitlab.com/gitlab-org/gitaly/build-$CI_JOB_NAME:latest --build-arg CUSTOM_IMAGE_VERSION=$CI_JOB_NAME _support/build-images/$CI_JOB_NAME - docker push registry.gitlab.com/gitlab-org/gitaly/build-$CI_JOB_NAME:latest ruby-2.3-golang-1.8-git-2.9: *build_image diff --git a/_support/build-images/versioned/Dockerfile b/_support/build-images/versioned/Dockerfile index b6a1a0aff..097dbb258 100644 --- a/_support/build-images/versioned/Dockerfile +++ b/_support/build-images/versioned/Dockerfile @@ -5,8 +5,8 @@ RUN mkdir -p /bundle-cache RUN echo $(ls -la) -COPY ./ruby/Gemfile /bundle-cache -COPY ./ruby/Gemfile.lock /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 && \ |