From 50295f3a139273601b5f2df29060ee2788f067d3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 22 Sep 2014 10:09:23 -0600 Subject: [PATCH] Update Ruby versions and fix installation issues with trying to remove procps and thus init --- 1.9/Dockerfile | 6 ++++-- 2.0/Dockerfile | 8 +++++--- 2.0/onbuild/Dockerfile | 2 +- 2.1/Dockerfile | 8 +++++--- 2.1/onbuild/Dockerfile | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/1.9/Dockerfile b/1.9/Dockerfile index ff5ccf98c..00a4be645 100644 --- a/1.9/Dockerfile +++ b/1.9/Dockerfile @@ -1,12 +1,14 @@ FROM buildpack-deps:wheezy +RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/* + ENV RUBY_MAJOR 1.9 ENV RUBY_VERSION 1.9.3-p547 # some of ruby's build scripts are written in ruby # we purge this later to make sure our final image uses what we just built RUN apt-get update \ - && apt-get install -y bison curl ruby procps \ + && apt-get install -y bison ruby \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/ruby \ && curl -SL "http://cache.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.bz2" \ @@ -15,7 +17,7 @@ RUN apt-get update \ && autoconf \ && ./configure --disable-install-doc \ && make \ - && apt-get purge -y --auto-remove bison ruby procps \ + && apt-get purge -y --auto-remove bison ruby \ && make install \ && rm -r /usr/src/ruby diff --git a/2.0/Dockerfile b/2.0/Dockerfile index a71b91106..4557e2d75 100644 --- a/2.0/Dockerfile +++ b/2.0/Dockerfile @@ -1,12 +1,14 @@ FROM buildpack-deps:jessie +RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/* + ENV RUBY_MAJOR 2.0 -ENV RUBY_VERSION 2.0.0-p481 +ENV RUBY_VERSION 2.0.0-p576 # some of ruby's build scripts are written in ruby # we purge this later to make sure our final image uses what we just built RUN apt-get update \ - && apt-get install -y bison curl ruby procps \ + && apt-get install -y bison ruby \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/ruby \ && curl -SL "http://cache.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.bz2" \ @@ -15,7 +17,7 @@ RUN apt-get update \ && autoconf \ && ./configure --disable-install-doc \ && make -j"$(nproc)" \ - && apt-get purge -y --auto-remove bison ruby procps \ + && apt-get purge -y --auto-remove bison ruby \ && make install \ && rm -r /usr/src/ruby diff --git a/2.0/onbuild/Dockerfile b/2.0/onbuild/Dockerfile index a8146690b..2a5724eff 100644 --- a/2.0/onbuild/Dockerfile +++ b/2.0/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.0.0-p481 +FROM ruby:2.0.0-p576 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.1/Dockerfile b/2.1/Dockerfile index a0b996c83..88ebdd398 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -1,12 +1,14 @@ FROM buildpack-deps:jessie +RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/* + ENV RUBY_MAJOR 2.1 -ENV RUBY_VERSION 2.1.2 +ENV RUBY_VERSION 2.1.3 # some of ruby's build scripts are written in ruby # we purge this later to make sure our final image uses what we just built RUN apt-get update \ - && apt-get install -y bison curl ruby procps \ + && apt-get install -y bison ruby \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/ruby \ && curl -SL "http://cache.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.bz2" \ @@ -15,7 +17,7 @@ RUN apt-get update \ && autoconf \ && ./configure --disable-install-doc \ && make -j"$(nproc)" \ - && apt-get purge -y --auto-remove bison ruby procps \ + && apt-get purge -y --auto-remove bison ruby \ && make install \ && rm -r /usr/src/ruby diff --git a/2.1/onbuild/Dockerfile b/2.1/onbuild/Dockerfile index 01946a034..8c9a61ae5 100644 --- a/2.1/onbuild/Dockerfile +++ b/2.1/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.1.2 +FROM ruby:2.1.3 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app