Skip to content

Commit ef96a96

Browse files
committed
Merge pull request #15 from infosiftr/update-and-fix
Update Ruby versions and fix installation issues with trying to remove procps and thus init
2 parents 96c73f0 + 50295f3 commit ef96a96

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

1.9/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
FROM buildpack-deps:wheezy
22

3+
RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/*
4+
35
ENV RUBY_MAJOR 1.9
46
ENV RUBY_VERSION 1.9.3-p547
57

68
# some of ruby's build scripts are written in ruby
79
# we purge this later to make sure our final image uses what we just built
810
RUN apt-get update \
9-
&& apt-get install -y bison curl ruby procps \
11+
&& apt-get install -y bison ruby \
1012
&& rm -rf /var/lib/apt/lists/* \
1113
&& mkdir -p /usr/src/ruby \
1214
&& curl -SL "http://cache.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.bz2" \
@@ -15,7 +17,7 @@ RUN apt-get update \
1517
&& autoconf \
1618
&& ./configure --disable-install-doc \
1719
&& make \
18-
&& apt-get purge -y --auto-remove bison ruby procps \
20+
&& apt-get purge -y --auto-remove bison ruby \
1921
&& make install \
2022
&& rm -r /usr/src/ruby
2123

2.0/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
FROM buildpack-deps:jessie
22

3+
RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/*
4+
35
ENV RUBY_MAJOR 2.0
4-
ENV RUBY_VERSION 2.0.0-p481
6+
ENV RUBY_VERSION 2.0.0-p576
57

68
# some of ruby's build scripts are written in ruby
79
# we purge this later to make sure our final image uses what we just built
810
RUN apt-get update \
9-
&& apt-get install -y bison curl ruby procps \
11+
&& apt-get install -y bison ruby \
1012
&& rm -rf /var/lib/apt/lists/* \
1113
&& mkdir -p /usr/src/ruby \
1214
&& curl -SL "http://cache.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.bz2" \
@@ -15,7 +17,7 @@ RUN apt-get update \
1517
&& autoconf \
1618
&& ./configure --disable-install-doc \
1719
&& make -j"$(nproc)" \
18-
&& apt-get purge -y --auto-remove bison ruby procps \
20+
&& apt-get purge -y --auto-remove bison ruby \
1921
&& make install \
2022
&& rm -r /usr/src/ruby
2123

2.0/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.0.0-p481
1+
FROM ruby:2.0.0-p576
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

2.1/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
FROM buildpack-deps:jessie
22

3+
RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/*
4+
35
ENV RUBY_MAJOR 2.1
4-
ENV RUBY_VERSION 2.1.2
6+
ENV RUBY_VERSION 2.1.3
57

68
# some of ruby's build scripts are written in ruby
79
# we purge this later to make sure our final image uses what we just built
810
RUN apt-get update \
9-
&& apt-get install -y bison curl ruby procps \
11+
&& apt-get install -y bison ruby \
1012
&& rm -rf /var/lib/apt/lists/* \
1113
&& mkdir -p /usr/src/ruby \
1214
&& curl -SL "http://cache.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.bz2" \
@@ -15,7 +17,7 @@ RUN apt-get update \
1517
&& autoconf \
1618
&& ./configure --disable-install-doc \
1719
&& make -j"$(nproc)" \
18-
&& apt-get purge -y --auto-remove bison ruby procps \
20+
&& apt-get purge -y --auto-remove bison ruby \
1921
&& make install \
2022
&& rm -r /usr/src/ruby
2123

2.1/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.1.2
1+
FROM ruby:2.1.3
22

33
RUN mkdir -p /usr/src/app
44
WORKDIR /usr/src/app

0 commit comments

Comments
 (0)