From 47bdebcc0f04bd4b1ec5cf0cfe084822756161ca Mon Sep 17 00:00:00 2001 From: f Date: Wed, 18 Sep 2019 13:56:54 -0300 Subject: [PATCH] musl --- Dockerfile | 5 +++++ rubygems-platform-musl.patch | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 rubygems-platform-musl.patch diff --git a/Dockerfile b/Dockerfile index 35d3850..ebc874b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,5 +29,10 @@ COPY --from=build /srv/http /srv/http RUN install -dm 2750 -o app -g www-data /srv/gems RUN chmod 755 /usr/local/bin/geminabox +# https://github.com/rubygems/rubygems/issues/2918 +# https://gitlab.alpinelinux.org/alpine/aports/issues/10808 +COPY ./rubygems-platform-musl.patch /tmp/ +RUN patch -d /usr/lib/ruby/2.5.0 -Np 0 -i /tmp/rubygems-platform-musl.patch + EXPOSE 9292 VOLUME /srv/gems diff --git a/rubygems-platform-musl.patch b/rubygems-platform-musl.patch new file mode 100644 index 0000000..4034704 --- /dev/null +++ b/rubygems-platform-musl.patch @@ -0,0 +1,25 @@ +--- rubygems/platform.rb.orig ++++ rubygems/platform.rb +@@ -89,7 +89,7 @@ + when /^dalvik(\d+)?$/ then [ 'dalvik', $1 ] + when /^dotnet$/ then [ 'dotnet', nil ] + when /^dotnet([\d.]*)/ then [ 'dotnet', $1 ] +- when /linux/ then [ 'linux', $1 ] ++ when /linux-?(\w+)?/ then [ 'linux', $1 ] + when /mingw32/ then [ 'mingw32', nil ] + when /(mswin\d+)(\_(\d+))?/ then + os, version = $1, $3 +--- rubygems.rb.orig ++++ rubygems.rb +@@ -764,10 +764,7 @@ + def self.platforms + @platforms ||= [] + if @platforms.empty? +- # XXX: Patched to avoid installing platform-specific gems with binaries +- # linked against glibc. +- @platforms = [Gem::Platform::RUBY] +- #@platforms = [Gem::Platform::RUBY, Gem::Platform.local] ++ @platforms = [Gem::Platform::RUBY, Gem::Platform.local] + end + @platforms + end