ruby 2.7.1

This commit is contained in:
f 2020-09-26 17:01:45 -03:00
parent 49af537015
commit 55942173f3
3 changed files with 3 additions and 25 deletions

View file

@ -1,11 +0,0 @@
stages:
- build
build:
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --destination $CI_REGISTRY_IMAGE:latest

View file

@ -1,6 +1,6 @@
FROM registry.0xacab.org/sutty/containers/sdk:latest
FROM sutty/sdk:latest
MAINTAINER "f <f@sutty.nl>"
ENV VERSION 2.6.6
ENV VERSION 2.7.1
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
@ -15,6 +15,6 @@ 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.6.0 -Np 0 -i /tmp/rubygems-platform-musl.patch
RUN patch -d /usr/lib/ruby/2.7.0 -Np 0 -i /tmp/rubygems-platform-musl.patch
ENTRYPOINT /bin/sh

View file

@ -1,14 +1,3 @@
--- 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 @@