From ee2df55c3abd3d0eccea5733f7041b733f8a5a62 Mon Sep 17 00:00:00 2001 From: ojab Date: Thu, 7 Dec 2017 11:22:34 +0000 Subject: [PATCH] Add "alpine3.7" variant of 2.4 & 2.5-rc --- .travis.yml | 2 + 2.4/alpine3.7/Dockerfile | 110 ++++++++++++++++++++++++++++++++++ 2.5-rc/alpine3.7/Dockerfile | 110 ++++++++++++++++++++++++++++++++++ generate-stackbrew-library.sh | 5 +- update.sh | 2 +- 5 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 2.4/alpine3.7/Dockerfile create mode 100644 2.5-rc/alpine3.7/Dockerfile diff --git a/.travis.yml b/.travis.yml index fbdf65fee..265ea2eff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,13 @@ services: docker env: - VERSION=2.5-rc VARIANT=stretch - VERSION=2.5-rc VARIANT=stretch/slim + - VERSION=2.5-rc VARIANT=alpine3.7 - VERSION=2.5-rc VARIANT=alpine3.6 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=alpine3.6 - VERSION=2.4 VARIANT=alpine3.4 - VERSION=2.3 VARIANT=jessie diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile new file mode 100644 index 000000000..137b1d438 --- /dev/null +++ b/2.4/alpine3.7/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.7 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.4 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBYGEMS_VERSION 2.7.3 +ENV BUNDLER_VERSION 1.16.0 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libressl-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5-rc/alpine3.7/Dockerfile new file mode 100644 index 000000000..03ab826c7 --- /dev/null +++ b/2.5-rc/alpine3.7/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.7 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5-rc +ENV RUBY_VERSION 2.5.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBYGEMS_VERSION 2.7.3 +ENV BUNDLER_VERSION 1.16.0 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libressl-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5a81d88fe..c13492e12 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -12,11 +12,12 @@ declare -A debianSuites=( [2.3]='jessie' [2.4]='jessie' ) -defaultAlpineVersion='3.6' +defaultAlpineVersion='3.7' declare -A alpineVersions=( [2.2]='3.4' [2.3]='3.4' [2.4]='3.4' + [2.4]='3.6' ) self="$(basename "$BASH_SOURCE")" @@ -87,7 +88,7 @@ for version in "${versions[@]}"; do for v in \ {stretch,jessie}{,/slim,/onbuild} \ - alpine{3.6,3.4} \ + alpine{3.7,3.6,3.4} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index efc43e69f..a3b502b74 100755 --- a/update.sh +++ b/update.sh @@ -67,7 +67,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; rubygems $rubygems, bundler $bundler; $shaVal" for v in \ - alpine{3.4,3.6} \ + alpine{3.4,3.6,3.7} \ {jessie,stretch}{/slim,/onbuild,} \ ; do dir="$version/$v"