diff --git a/.travis.yml b/.travis.yml index 4279917d5..8493a8f17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,10 @@ sudo: 9000 env: - VERSION=2.2 VARIANT= - VERSION=2.2 VARIANT=slim - - VERSION=2.2 VARIANT=wheezy - VERSION=2.1 VARIANT= - VERSION=2.1 VARIANT=slim - - VERSION=2.1 VARIANT=wheezy - VERSION=2.0 VARIANT= - VERSION=2.0 VARIANT=slim - - VERSION=2.0 VARIANT=wheezy install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.0/wheezy/Dockerfile b/2.0/wheezy/Dockerfile deleted file mode 100644 index fda6a355b..000000000 --- a/2.0/wheezy/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM buildpack-deps:wheezy - -ENV RUBY_MAJOR 2.0 -ENV RUBY_VERSION 2.0.0-p645 - -# 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 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" - -# install things globally, for great justice -ENV GEM_HOME /usr/local/bundle -ENV PATH $GEM_HOME/bin:$PATH - -ENV BUNDLER_VERSION 1.10.6 - -RUN gem install bundler --version "$BUNDLER_VERSION" \ - && 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 - -CMD [ "irb" ] diff --git a/2.1/wheezy/Dockerfile b/2.1/wheezy/Dockerfile deleted file mode 100644 index 6b285379b..000000000 --- a/2.1/wheezy/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM buildpack-deps:wheezy - -ENV RUBY_MAJOR 2.1 -ENV RUBY_VERSION 2.1.6 - -# 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 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" - -# install things globally, for great justice -ENV GEM_HOME /usr/local/bundle -ENV PATH $GEM_HOME/bin:$PATH - -ENV BUNDLER_VERSION 1.10.6 - -RUN gem install bundler --version "$BUNDLER_VERSION" \ - && 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 - -CMD [ "irb" ] diff --git a/2.2/wheezy/Dockerfile b/2.2/wheezy/Dockerfile deleted file mode 100644 index 0787b021c..000000000 --- a/2.2/wheezy/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM buildpack-deps:wheezy - -ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.2 - -# 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 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" - -# install things globally, for great justice -ENV GEM_HOME /usr/local/bundle -ENV PATH $GEM_HOME/bin:$PATH - -ENV BUNDLER_VERSION 1.10.6 - -RUN gem install bundler --version "$BUNDLER_VERSION" \ - && 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 - -CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 7ea2b1dce..89c8d38c3 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -30,7 +30,7 @@ for version in "${versions[@]}"; do echo "$va: ${url}@${commit} $version" done - for variant in onbuild slim wheezy; do + for variant in onbuild slim; do commit="$(git log -1 --format='format:%H' -- "$version/$variant")" echo for va in "${versionAliases[@]}"; do diff --git a/update.sh b/update.sh index 498b66d9b..040c57253 100755 --- a/update.sh +++ b/update.sh @@ -26,7 +26,7 @@ for version in "${versions[@]}"; do s/^(ENV RUBY_VERSION) .*/\1 '"$fullVersion"'/; s/^(ENV RUBY_DOWNLOAD_SHA256) .*/\1 '"$shaVal"'/; s/^(ENV BUNDLER_VERSION) .*/\1 '"$bundler"'/; - ' "$version/"{,wheezy/,slim/}Dockerfile + ' "$version/"{,slim/}Dockerfile sed -ri 's/^(FROM ruby):.*/\1:'"$fullVersion"'/' "$version/"*"/Dockerfile" ) done