From 8c8394eebfff558f3aa00780e09f73f04e8eca56 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 21 Jan 2015 14:19:35 -0800 Subject: [PATCH] Fix wheezy versions with gdbm too --- 1.9/wheezy/Dockerfile | 6 ++---- 2.0/wheezy/Dockerfile | 30 ++++++++++++++---------------- 2.1/wheezy/Dockerfile | 6 ++---- 2.2/wheezy/Dockerfile | 6 ++---- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/1.9/wheezy/Dockerfile b/1.9/wheezy/Dockerfile index 0a136e4d4..a0eb5774d 100644 --- a/1.9/wheezy/Dockerfile +++ b/1.9/wheezy/Dockerfile @@ -1,14 +1,12 @@ 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-p551 # 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 ruby \ + && apt-get install -y bison libgdbm-dev 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" \ @@ -17,8 +15,8 @@ RUN apt-get update \ && autoconf \ && ./configure --disable-install-doc \ && make \ - && apt-get purge -y --auto-remove bison ruby \ && make install \ + && apt-get purge -y --auto-remove bison libgdbm-dev ruby \ && rm -r /usr/src/ruby # skip installing gem documentation diff --git a/2.0/wheezy/Dockerfile b/2.0/wheezy/Dockerfile index c6afffb99..db9afec23 100644 --- a/2.0/wheezy/Dockerfile +++ b/2.0/wheezy/Dockerfile @@ -1,25 +1,23 @@ FROM buildpack-deps:wheezy -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-p598 # 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 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" \ - | tar -xjC /usr/src/ruby --strip-components=1 \ - && cd /usr/src/ruby \ - && autoconf \ - && ./configure --disable-install-doc \ - && make -j"$(nproc)" \ - && apt-get purge -y --auto-remove bison ruby \ - && make install \ - && rm -r /usr/src/ruby + && apt-get install -y bison libgdbm-dev 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" \ + | tar -xjC /usr/src/ruby --strip-components=1 \ + && cd /usr/src/ruby \ + && autoconf \ + && ./configure --disable-install-doc \ + && make -j"$(nproc)" \ + && make install \ + && apt-get purge -y --auto-remove bison libgdbm-dev ruby \ + && rm -r /usr/src/ruby # skip installing gem documentation RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc" @@ -28,8 +26,8 @@ RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc" ENV GEM_HOME /usr/local/bundle ENV PATH $GEM_HOME/bin:$PATH RUN gem install bundler \ - && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global path "$GEM_HOME" \ + && bundle config --global bin "$GEM_HOME/bin" # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.1/wheezy/Dockerfile b/2.1/wheezy/Dockerfile index 829efa9ca..a8f3eba72 100644 --- a/2.1/wheezy/Dockerfile +++ b/2.1/wheezy/Dockerfile @@ -1,14 +1,12 @@ FROM buildpack-deps:wheezy -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.5 # 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 ruby \ + && apt-get install -y bison libgdbm-dev 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" \ @@ -17,8 +15,8 @@ RUN apt-get update \ && autoconf \ && ./configure --disable-install-doc \ && make -j"$(nproc)" \ - && apt-get purge -y --auto-remove bison ruby \ && make install \ + && apt-get purge -y --auto-remove bison libgdbm-dev ruby \ && rm -r /usr/src/ruby # skip installing gem documentation diff --git a/2.2/wheezy/Dockerfile b/2.2/wheezy/Dockerfile index 567fe60ff..eebab44aa 100644 --- a/2.2/wheezy/Dockerfile +++ b/2.2/wheezy/Dockerfile @@ -1,14 +1,12 @@ FROM buildpack-deps:wheezy -RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/* - ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.0 # 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 ruby \ + && apt-get install -y bison libgdbm-dev 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" \ @@ -17,8 +15,8 @@ RUN apt-get update \ && autoconf \ && ./configure --disable-install-doc \ && make -j"$(nproc)" \ - && apt-get purge -y --auto-remove bison ruby \ && make install \ + && apt-get purge -y --auto-remove bison libgdbm-dev ruby \ && rm -r /usr/src/ruby # skip installing gem documentation