From c061f3ad9452c22e2151b941dea0a77418e6dc2c Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 9 Mar 2018 16:00:08 -0500 Subject: [PATCH 1/9] Add jemalloc support --- 2.2/jessie/slim/Dockerfile | 5 +++ 2.3/jessie/slim/Dockerfile | 5 +++ 2.3/stretch/slim/Dockerfile | 5 +++ 2.4/jessie/slim/Dockerfile | 5 +++ 2.4/stretch/slim/Dockerfile | 5 +++ 2.5/stretch/slim/Dockerfile | 5 +++ Dockerfile-slim.template | 5 +++ benchmark.rb | 82 +++++++++++++++++++++++++++++++++++++ update.sh | 4 ++ 9 files changed, 121 insertions(+) create mode 100644 benchmark.rb diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 9de0e93f6d..c98b16ba02 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 566a1e8a23..d69c7364f8 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 9ae32e1d5f..d99ad1799b 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index ac376bf6d3..abae84e22e 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 536e67a2d3..bde16db4b8 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index b01b3e0234..e6820d2662 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 80834f1a7a..ad5f98ecb9 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -10,6 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ + %%EXTRA_DEPENDENCIES%% \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -74,6 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + %%EXTRA_CONFIGURATIONS%% \ && make -j "$(nproc)" \ && make install \ \ @@ -88,6 +90,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/benchmark.rb b/benchmark.rb new file mode 100644 index 0000000000..8414df1906 --- /dev/null +++ b/benchmark.rb @@ -0,0 +1,82 @@ +# The Computer Language Shootout +# http://shootout.alioth.debian.org/ +# Contributed by Sokolov Yura + +$last = 42.0 +def gen_random (max,im=139968,ia=3877,ic=29573) + (max * ($last = ($last * ia + ic) % im)) / im +end + +alu = + "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+ + "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+ + "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+ + "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+ + "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+ + "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+ + "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA" + +iub = [ + ["a", 0.27], + ["c", 0.12], + ["g", 0.12], + ["t", 0.27], + + ["B", 0.02], + ["D", 0.02], + ["H", 0.02], + ["K", 0.02], + ["M", 0.02], + ["N", 0.02], + ["R", 0.02], + ["S", 0.02], + ["V", 0.02], + ["W", 0.02], + ["Y", 0.02], +] +homosapiens = [ + ["a", 0.3029549426680], + ["c", 0.1979883004921], + ["g", 0.1975473066391], + ["t", 0.3015094502008], +] + +def make_repeat_fasta(id, desc, src, n) + puts ">#{id} #{desc}" + v = nil + width = 60 + l = src.length + s = src * ((n / l) + 1) + s.slice!(n, l) + puts (s.scan(/.{1,#{width}}/).join("\n")) +end + +def make_random_fasta(id, desc, table, n) + puts ">#{id} #{desc}" + rand, v = nil,nil + width = 60 + chunk = 1 * width + prob = 0.0 + table.each{|v| v[1]= (prob += v[1])} + for i in 1..(n/width) + puts (1..width).collect{ + rand = gen_random(1.0) + table.find{|v| v[1]>rand}[0] + }.join + end + if n%width != 0 + puts (1..(n%width)).collect{ + rand = gen_random(1.0) + table.find{|v| v[1]>rand}[0] + }.join + end +end + +require 'benchmark' +Benchmark.measure do |n| + for i in 1..n; + make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2) + make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3) + make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5) + end +end diff --git a/update.sh b/update.sh index 5a31edfe23..8db684a1f9 100755 --- a/update.sh +++ b/update.sh @@ -87,6 +87,10 @@ for version in "${versions[@]}"; do -e 's!%%SHA256%%!'"$shaVal"'!g' \ -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ -e 's!%%BUNDLER%%!'"$bundler"'!g' \ + # TODO Should this be supplied for all builds? + # TODO If only Debian, we can move this to the .template file + -e 's!%%EXTRA_DEPENDENCIES%%!libjemalloc-dev!g' \ + -e 's!%%EXTRA_CONFIGURATIONS%%!--with-jemalloc!g' \ -e "$( if [ "$version" = 2.3 ] && [[ "$v" = stretch* ]]; then echo 's/libssl-dev/libssl1.0-dev/g' From 1d0303f5970cf1e43f17751840856b6c97555c01 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 9 Mar 2018 16:02:55 -0500 Subject: [PATCH 2/9] Remove benchmark --- benchmark.rb | 82 ---------------------------------------------------- 1 file changed, 82 deletions(-) delete mode 100644 benchmark.rb diff --git a/benchmark.rb b/benchmark.rb deleted file mode 100644 index 8414df1906..0000000000 --- a/benchmark.rb +++ /dev/null @@ -1,82 +0,0 @@ -# The Computer Language Shootout -# http://shootout.alioth.debian.org/ -# Contributed by Sokolov Yura - -$last = 42.0 -def gen_random (max,im=139968,ia=3877,ic=29573) - (max * ($last = ($last * ia + ic) % im)) / im -end - -alu = - "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+ - "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+ - "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+ - "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+ - "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+ - "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+ - "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA" - -iub = [ - ["a", 0.27], - ["c", 0.12], - ["g", 0.12], - ["t", 0.27], - - ["B", 0.02], - ["D", 0.02], - ["H", 0.02], - ["K", 0.02], - ["M", 0.02], - ["N", 0.02], - ["R", 0.02], - ["S", 0.02], - ["V", 0.02], - ["W", 0.02], - ["Y", 0.02], -] -homosapiens = [ - ["a", 0.3029549426680], - ["c", 0.1979883004921], - ["g", 0.1975473066391], - ["t", 0.3015094502008], -] - -def make_repeat_fasta(id, desc, src, n) - puts ">#{id} #{desc}" - v = nil - width = 60 - l = src.length - s = src * ((n / l) + 1) - s.slice!(n, l) - puts (s.scan(/.{1,#{width}}/).join("\n")) -end - -def make_random_fasta(id, desc, table, n) - puts ">#{id} #{desc}" - rand, v = nil,nil - width = 60 - chunk = 1 * width - prob = 0.0 - table.each{|v| v[1]= (prob += v[1])} - for i in 1..(n/width) - puts (1..width).collect{ - rand = gen_random(1.0) - table.find{|v| v[1]>rand}[0] - }.join - end - if n%width != 0 - puts (1..(n%width)).collect{ - rand = gen_random(1.0) - table.find{|v| v[1]>rand}[0] - }.join - end -end - -require 'benchmark' -Benchmark.measure do |n| - for i in 1..n; - make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2) - make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3) - make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5) - end -end From 925c5e08b00042e79e762915d30203969ca322ee Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Sun, 11 Mar 2018 16:15:58 -0400 Subject: [PATCH 3/9] Make it default for Linux --- 2.2/jessie/Dockerfile | 2 ++ 2.3/jessie/Dockerfile | 2 ++ 2.3/stretch/Dockerfile | 2 ++ 2.4/jessie/Dockerfile | 2 ++ 2.4/stretch/Dockerfile | 2 ++ 2.5/stretch/Dockerfile | 2 ++ Dockerfile-debian.template | 2 ++ Dockerfile-slim.template | 4 ++-- update.sh | 4 ---- 9 files changed, 16 insertions(+), 6 deletions(-) diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 9c22d395c8..7e04179050 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -51,6 +52,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 92acbbb893..5e08d63542 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -51,6 +52,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 112cff8658..5c93154d12 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -53,6 +54,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 04b703128c..d617d97e7a 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -51,6 +52,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index b3a527b837..5056a57f66 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -51,6 +52,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index f44b2814ad..ea5c0108e3 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -51,6 +52,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index fe02a2953a..680f594c9d 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -24,6 +24,7 @@ RUN set -ex \ # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ ruby \ + # libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -53,6 +54,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index ad5f98ecb9..8369561557 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -10,7 +10,7 @@ RUN apt-get update \ libyaml-dev \ procps \ zlib1g-dev \ - %%EXTRA_DEPENDENCIES%% \ + libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -75,7 +75,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - %%EXTRA_CONFIGURATIONS%% \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ diff --git a/update.sh b/update.sh index 8db684a1f9..5a31edfe23 100755 --- a/update.sh +++ b/update.sh @@ -87,10 +87,6 @@ for version in "${versions[@]}"; do -e 's!%%SHA256%%!'"$shaVal"'!g' \ -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ -e 's!%%BUNDLER%%!'"$bundler"'!g' \ - # TODO Should this be supplied for all builds? - # TODO If only Debian, we can move this to the .template file - -e 's!%%EXTRA_DEPENDENCIES%%!libjemalloc-dev!g' \ - -e 's!%%EXTRA_CONFIGURATIONS%%!--with-jemalloc!g' \ -e "$( if [ "$version" = 2.3 ] && [[ "$v" = stretch* ]]; then echo 's/libssl-dev/libssl1.0-dev/g' From 7e47cf2aaf513a186973d00a628118e77c8c1f24 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Sun, 11 Mar 2018 16:21:45 -0400 Subject: [PATCH 4/9] Add dependency to Debian --- 2.2/jessie/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- Dockerfile-debian.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 7e04179050..df67ca63e4 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 5e08d63542..c7070850f9 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 5c93154d12..2cfb16bb9c 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex \ # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index d617d97e7a..1e276c3868 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 5056a57f66..e6b9c597ad 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index ea5c0108e3..6e19f2ef3a 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 680f594c9d..66ed724d90 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -24,7 +24,7 @@ RUN set -ex \ # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ ruby \ - # libjemalloc-dev \ + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ From d3415d4046f8c4f5ce57aea4af129389a406c404 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Sun, 11 Mar 2018 16:42:53 -0400 Subject: [PATCH 5/9] Make jemalloc a runtime dependency --- 2.2/jessie/Dockerfile | 6 ++++-- 2.3/jessie/Dockerfile | 6 ++++-- 2.3/stretch/Dockerfile | 6 ++++-- 2.4/jessie/Dockerfile | 6 ++++-- 2.4/stretch/Dockerfile | 6 ++++-- 2.5/stretch/Dockerfile | 6 ++++-- Dockerfile-debian.template | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index df67ca63e4..c73af3b8a3 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -22,10 +22,12 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index c7070850f9..3349c492d3 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -22,10 +22,12 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 2cfb16bb9c..84d5df2eb3 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -24,10 +24,12 @@ RUN set -ex \ # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 1e276c3868..c711a07bc1 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -22,10 +22,12 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index e6b9c597ad..f9ee96b9d9 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -22,10 +22,12 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 6e19f2ef3a..6fc4d21de7 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -22,10 +22,12 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 66ed724d90..aa5cbfa609 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -24,10 +24,12 @@ RUN set -ex \ # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ ruby \ - libjemalloc-dev \ + ' \ + && runtimeDeps=' \ + libjemalloc-dev ' \ && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ + && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ From c035bb0db16e43ccc1473ce0549eb7e7eafdc1e9 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Sun, 11 Mar 2018 16:47:54 -0400 Subject: [PATCH 6/9] Add missing \ --- 2.2/jessie/Dockerfile | 5 ++++- 2.3/jessie/Dockerfile | 5 ++++- 2.3/stretch/Dockerfile | 5 ++++- 2.4/jessie/Dockerfile | 5 ++++- 2.4/stretch/Dockerfile | 5 ++++- 2.5/stretch/Dockerfile | 5 ++++- Dockerfile-debian.template | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index c73af3b8a3..61d5d848b3 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -66,6 +66,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 3349c492d3..59d5d797b4 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -66,6 +66,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 84d5df2eb3..40a19d5a5d 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -68,6 +68,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index c711a07bc1..836a726b26 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -66,6 +66,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index f9ee96b9d9..b275cfa479 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -66,6 +66,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 6fc4d21de7..d0071be378 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -66,6 +66,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index aa5cbfa609..be03c635bb 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -26,7 +26,7 @@ RUN set -ex \ ruby \ ' \ && runtimeDeps=' \ - libjemalloc-dev + libjemalloc-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps $runtimeDeps \ @@ -68,6 +68,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# TODO remove me before merging +RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle From 1b5f4bf6c20cd0cdf8a7996dd26d781bb0a576a9 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 19 Oct 2018 15:58:05 -0400 Subject: [PATCH 7/9] Make sanity check permanent --- Dockerfile-debian.template | 4 ++-- Dockerfile-slim.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index b747d664cf..c4b5e3e12b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -68,8 +68,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 7d09bef5e2..7f0e443bf7 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps From 9c2bb4c36c788efa552bfb0147eb31b10a3ceca0 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 19 Oct 2018 16:13:04 -0400 Subject: [PATCH 8/9] ./update.sh --- 2.3/alpine3.7/Dockerfile | 5 +++++ 2.3/alpine3.8/Dockerfile | 5 +++++ 2.3/jessie/Dockerfile | 4 ++-- 2.3/jessie/slim/Dockerfile | 6 +++--- 2.3/stretch/Dockerfile | 4 ++-- 2.3/stretch/slim/Dockerfile | 6 +++--- 2.4/alpine3.6/Dockerfile | 5 +++++ 2.4/alpine3.7/Dockerfile | 5 +++++ 2.4/jessie/Dockerfile | 4 ++-- 2.4/jessie/slim/Dockerfile | 6 +++--- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 6 +++--- 2.5/alpine3.7/Dockerfile | 5 +++++ 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 6 +++--- 2.6-rc/alpine3.7/Dockerfile | 5 +++++ 2.6-rc/alpine3.8/Dockerfile | 5 +++++ 2.6-rc/stretch/Dockerfile | 4 ++-- 2.6-rc/stretch/slim/Dockerfile | 6 +++--- Dockerfile-alpine.template | 5 +++++ Dockerfile-slim.template | 2 +- 21 files changed, 71 insertions(+), 31 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 4b33e7c7c5..edc5a0679c 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 2f5d6b0c7f..493146e6c2 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 9b73c25010..0043dc9ab6 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -66,8 +66,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index eb980b150e..2c75f3cc83 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index f24fc9cd0a..558c55b9bd 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -68,8 +68,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index e1642aa5b8..2503e564a7 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl1.0-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index f1f230a12c..7a957390ec 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index d4274fabde..2be4f57977 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 01e1bf57bb..06ea246455 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -66,8 +66,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 7d40431131..a88c927224 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 3c412d1688..93ef957260 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -66,8 +66,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 04b5328d59..353945e7ce 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index f2804c32fc..d5ae8f1fae 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 1b7b5f5b52..a8c4fde64b 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -66,8 +66,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 649fee7c67..aea71a7aad 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index c68fa34481..96aa7f5634 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 67b1d63215..529ea30817 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index c5f0b97146..7cbb9dbb64 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -66,8 +66,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 1b24c203fa..15b0152ec1 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation @@ -90,8 +90,8 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# TODO remove me before merging -RUN ruby -r rbconfig -e "RbConfig::CONFIG['LIBS'].include?('jemalloc') ? puts('Ruby is compiled with jemalloc') : warn('JEMALLOC IS MISSING FROM RUBY')" +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 44d86c18da..8ffe3ddba1 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -31,6 +31,7 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -80,6 +81,7 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -104,6 +106,9 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ +# Sanity check for jemalloc +RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" + # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 7f0e443bf7..ed6e89e31c 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -6,11 +6,11 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libjemalloc-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - libjemalloc-dev \ && rm -rf /var/lib/apt/lists/* # skip installing gem documentation From 6ba117a40ede93610121384e237ab5596f5d81ab Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 19 Oct 2018 16:49:13 -0400 Subject: [PATCH 9/9] Alpine still fails to build :( --- 2.3/alpine3.7/Dockerfile | 5 ----- 2.3/alpine3.8/Dockerfile | 5 ----- 2.4/alpine3.6/Dockerfile | 5 ----- 2.4/alpine3.7/Dockerfile | 5 ----- 2.5/alpine3.7/Dockerfile | 5 ----- 2.6-rc/alpine3.7/Dockerfile | 5 ----- 2.6-rc/alpine3.8/Dockerfile | 5 ----- Dockerfile-alpine.template | 5 ----- 8 files changed, 40 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index edc5a0679c..4b33e7c7c5 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 493146e6c2..2f5d6b0c7f 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 7a957390ec..f1f230a12c 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 2be4f57977..d4274fabde 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index d5ae8f1fae..f2804c32fc 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 96aa7f5634..c68fa34481 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 529ea30817..67b1d63215 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8ffe3ddba1..44d86c18da 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -31,7 +31,6 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libjemalloc-dev \ libressl \ libressl-dev \ libxml2-dev \ @@ -81,7 +80,6 @@ RUN set -ex \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - --with-jemalloc \ && make -j "$(nproc)" \ && make install \ \ @@ -106,9 +104,6 @@ RUN set -ex \ && gem install bundler --version "$BUNDLER_VERSION" --force \ && rm -r /root/.gem/ -# Sanity check for jemalloc -RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc')" - # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle