This commit is contained in:
f 2019-09-18 13:43:54 -03:00
parent d34c710c24
commit 35f24b0897
No known key found for this signature in database
GPG key ID: 2AE5A13E321F953D
2 changed files with 31 additions and 1 deletions

View file

@ -5,11 +5,16 @@ ENV VERSION 2.5.5
RUN apk add --no-cache git nodejs nodejs-npm yarn tzdata libxslt-dev libxml2-dev RUN apk add --no-cache git nodejs nodejs-npm yarn tzdata libxslt-dev libxml2-dev
RUN apk add --no-cache ruby-dev ruby-bundler ruby-json ruby-bigdecimal ruby-rake ruby-etc RUN apk add --no-cache ruby-dev ruby-bundler ruby-json ruby-bigdecimal ruby-rake ruby-etc
RUN apk add --no-cache postgresql-dev sqlite-dev mariadb-dev RUN apk add --no-cache postgresql-dev sqlite-dev mariadb-dev
RUN apk add --no-cache linux-headers cmake RUN apk add --no-cache linux-headers
RUN test "$VERSION" = `ruby -e 'puts RUBY_VERSION'` RUN test "$VERSION" = `ruby -e 'puts RUBY_VERSION'`
RUN addgroup -g 82 -S www-data RUN addgroup -g 82 -S www-data
RUN adduser -s /bin/sh -G www-data -h /home/app -D app RUN adduser -s /bin/sh -G www-data -h /home/app -D app
RUN install -dm 2750 -o app -g www-data /home/app/sutty RUN install -dm 2750 -o app -g www-data /home/app/sutty
# 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
ENTRYPOINT /bin/sh ENTRYPOINT /bin/sh

View file

@ -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