Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI to use Bundler 1.17.3 #763

Merged
merged 3 commits into from
May 24, 2019
Merged

Update CI to use Bundler 1.17.3 #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f664b1
Changed: CI to use Bundler 1.17.3
delner May 23, 2019
5fa9e41
Changed: Docker Hub repo for CI images.
delner May 24, 2019
c3b29fb
Changed: Bundler to 1.17.3 for Ruby 2.3
delner May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ job_defaults: &job_defaults

ruby_containers: &ruby_containers
- &container-1_9
image: datadog/docker-library:ddtrace_rb_1_9_3
image: palazzem/docker-library:ddtrace_rb_1_9_3
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_0
image: datadog/docker-library:ddtrace_rb_2_0_0
image: palazzem/docker-library:ddtrace_rb_2_0_0
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_1
image: datadog/docker-library:ddtrace_rb_2_1_10
image: palazzem/docker-library:ddtrace_rb_2_1_10
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_2
image: datadog/docker-library:ddtrace_rb_2_2_10
image: palazzem/docker-library:ddtrace_rb_2_2_10
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_3
image: datadog/docker-library:ddtrace_rb_2_3_7
image: palazzem/docker-library:ddtrace_rb_2_3_8
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_4
image: datadog/docker-library:ddtrace_rb_2_4_4
image: palazzem/docker-library:ddtrace_rb_2_4_6
environment:
- BUNDLE_GEMFILE=/app/Gemfile

Expand Down
8 changes: 6 additions & 2 deletions .circleci/images/primary/Dockerfile-1.9.3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Last version: https://github.com/docker-library/ruby/blob/90c4e3be58d565007c518d311d4bd05086a1638c/1.9/Dockerfile
FROM ruby:1.9.3

# Add Jessie repos
# Fixes https://superuser.com/questions/1423486/issue-with-fetching-http-deb-debian-org-debian-dists-jessie-updates-inrelease
RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
Expand Down Expand Up @@ -59,8 +63,8 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
&& dockerize --version

# Install RubyGems
RUN gem update --system
RUN gem install bundler
RUN gem update --system 2.7.9
RUN gem install bundler -v '1.17.3'
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 6 additions & 2 deletions .circleci/images/primary/Dockerfile-2.0.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Last version: https://github.com/docker-library/ruby/blob/c387c6c3a2505060514e31c247cb37d22c944e55/2.0/Dockerfile
FROM ruby:2.0.0

# Add Jessie repos
# Fixes https://superuser.com/questions/1423486/issue-with-fetching-http-deb-debian-org-debian-dists-jessie-updates-inrelease
RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
Expand Down Expand Up @@ -59,8 +63,8 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
&& dockerize --version

# Install RubyGems
RUN gem update --system
RUN gem install bundler
RUN gem update --system 2.7.9
RUN gem install bundler -v '1.17.3'
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 6 additions & 2 deletions .circleci/images/primary/Dockerfile-2.1.10
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Last version: https://github.com/docker-library/ruby/blob/99def14400fcd612782367830836dfcbc10c8c50/2.1/Dockerfile
FROM ruby:2.1.10

# Add Jessie repos
# Fixes https://superuser.com/questions/1423486/issue-with-fetching-http-deb-debian-org-debian-dists-jessie-updates-inrelease
RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
Expand Down Expand Up @@ -59,8 +63,8 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
&& dockerize --version

# Install RubyGems
RUN gem update --system
RUN gem install bundler
RUN gem update --system 2.7.9
RUN gem install bundler -v '1.17.3'
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 6 additions & 2 deletions .circleci/images/primary/Dockerfile-2.2.10
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Last version: https://github.com/docker-library/ruby/blob/395cce4eba52917eb9a40c72d50703a1ce9e1acd/2.2/jessie/Dockerfile
FROM ruby:2.2.10

# Add Jessie repos
# Fixes https://superuser.com/questions/1423486/issue-with-fetching-http-deb-debian-org-debian-dists-jessie-updates-inrelease
RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
Expand Down Expand Up @@ -59,8 +63,8 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
&& dockerize --version

# Install RubyGems
RUN gem update --system
RUN gem install bundler
RUN gem update --system 2.7.9
RUN gem install bundler -v '1.17.3'
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 5 additions & 3 deletions .circleci/images/primary/Dockerfile-2.4.4 → .circleci/images/primary/Dockerfile-2.3.8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Current version: https://github.com/docker-library/ruby/blob/699a04311386ecc98ca242fc9bdee17fb4008863/2.4/stretch/Dockerfile
FROM ruby:2.4.4
# Current version: https://github.com/docker-library/ruby/blob/31f66490fdb837ddcc5896e3275f2188f2b7b6dd/2.3/stretch/Dockerfile
FROM ruby:2.3.8

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
Expand Down Expand Up @@ -64,7 +64,9 @@ RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Install RubyGems
RUN gem update --system
RUN gem install bundler
# Ruby 2.3 can support Bundler 2+
# But hold back to < 2 for now, because some dependencies require it.
RUN gem install bundler -v '1.17.3'
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
4 changes: 2 additions & 2 deletions .circleci/images/primary/Dockerfile-2.3.7 → .circleci/images/primary/Dockerfile-2.4.6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Current version: https://github.com/docker-library/ruby/blob/699a04311386ecc98ca242fc9bdee17fb4008863/2.3/stretch/Dockerfile
FROM ruby:2.3.7
# Current version: https://github.com/docker-library/ruby/blob/802421922ef50cfa05c89a3c619992acf4329986/2.4/jessie/Dockerfile
FROM ruby:2.4.6

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.2'
services:
tracer-1.9:
image: datadog/docker-library:ddtrace_rb_1_9_3
image: palazzem/docker-library:ddtrace_rb_1_9_3
command: /bin/bash
depends_on:
- ddagent
Expand Down Expand Up @@ -29,7 +29,7 @@ services:
- bundle-1.9:/usr/local/bundle
- gemfiles-1.9:/app/gemfiles
tracer-2.0:
image: datadog/docker-library:ddtrace_rb_2_0_0
image: palazzem/docker-library:ddtrace_rb_2_0_0
command: /bin/bash
depends_on:
- ddagent
Expand Down Expand Up @@ -57,7 +57,7 @@ services:
- bundle-2.0:/usr/local/bundle
- gemfiles-2.0:/app/gemfiles
tracer-2.1:
image: datadog/docker-library:ddtrace_rb_2_1_10
image: palazzem/docker-library:ddtrace_rb_2_1_10
command: /bin/bash
depends_on:
- ddagent
Expand Down Expand Up @@ -85,7 +85,7 @@ services:
- bundle-2.1:/usr/local/bundle
- gemfiles-2.1:/app/gemfiles
tracer-2.2:
image: datadog/docker-library:ddtrace_rb_2_2_10
image: palazzem/docker-library:ddtrace_rb_2_2_10
command: /bin/bash
depends_on:
- ddagent
Expand Down Expand Up @@ -113,7 +113,7 @@ services:
- bundle-2.2:/usr/local/bundle
- gemfiles-2.2:/app/gemfiles
tracer-2.3:
image: datadog/docker-library:ddtrace_rb_2_3_7
image: palazzem/docker-library:ddtrace_rb_2_3_8
command: /bin/bash
depends_on:
- ddagent
Expand Down Expand Up @@ -141,7 +141,7 @@ services:
- bundle-2.3:/usr/local/bundle
- gemfiles-2.3:/app/gemfiles
tracer-2.4:
image: datadog/docker-library:ddtrace_rb_2_4_4
image: palazzem/docker-library:ddtrace_rb_2_4_6
command: /bin/bash
depends_on:
- ddagent
Expand Down