Sutty/containers-geminabox
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

back to 2.6 until we can update sutty

Browse source
This commit is contained in:
f 2020-09-12 12:18:45 -03:00
parent d78f8601af
commit c225c49793
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Dockerfile
View file

@ -1,17 +1,4 @@
FROM sutty/sdk-ruby:latest AS build FROM sutty/monit:3.11.6
MAINTAINER "f <f@sutty.nl>"
ENV RACK_ENV=production
RUN install -dm 2750 -o app -g www-data /srv/http
USER app
WORKDIR /srv/http
COPY --chown=app:www-data ./Gemfile .
COPY --chown=app:www-data ./config.ru .
RUN bundle install --path=./vendor
FROM sutty/monit:latest
ENV RACK_ENV=production ENV RACK_ENV=production
RUN addgroup -g 82 -S www-data RUN addgroup -g 82 -S www-data
@ -21,14 +8,21 @@ RUN apk add --no-cache ruby ruby-bundler ruby-json
RUN apk add --no-cache daemonize RUN apk add --no-cache daemonize
COPY ./monit.conf /etc/monit.d/geminabox.conf COPY ./monit.conf /etc/monit.d/geminabox.conf
COPY ./geminabox.sh /usr/local/bin/geminabox COPY ./geminabox.sh /usr/local/bin/geminabox
COPY --from=build /srv/http /srv/http
RUN install -dm 2750 -o app -g www-data /srv/gems RUN install -dm 2750 -o app -g www-data /srv/gems
RUN chmod 755 /usr/local/bin/geminabox RUN chmod 755 /usr/local/bin/geminabox
# https://github.com/rubygems/rubygems/issues/2918 # https://github.com/rubygems/rubygems/issues/2918
# https://gitlab.alpinelinux.org/alpine/aports/issues/10808 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808
COPY ./rubygems-platform-musl.patch /tmp/ COPY ./rubygems-platform-musl.patch /tmp/
RUN apk add --no-cache patch && cd /usr/lib/ruby/2.7.0 && patch -Np 0 -i /tmp/rubygems-platform-musl.patch && apk del patch RUN cd /usr/lib/ruby/2.6.0 && patch -Np 0 -i /tmp/rubygems-platform-musl.patch
USER app
WORKDIR /srv/http
COPY --chown=app:www-data ./Gemfile .
COPY --chown=app:www-data ./config.ru .
RUN bundle install --path=./vendor
USER root
EXPOSE 9292 EXPOSE 9292
VOLUME /srv/gems VOLUME /srv/gems

11
rubygems-platform-musl.patch
View file

@ -1,3 +1,14 @@
--- 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.orig
+++ rubygems.rb +++ rubygems.rb
@@ -764,10 +764,7 @@ @@ -764,10 +764,7 @@