From 55942173f3ba9428c25b34de11ad9b5226f920ef Mon Sep 17 00:00:00 2001 From: f Date: Sat, 26 Sep 2020 17:01:45 -0300 Subject: [PATCH] ruby 2.7.1 --- .gitlab-ci.yml | 11 ----------- Dockerfile | 6 +++--- rubygems-platform-musl.patch | 11 ----------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 304be82..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -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 diff --git a/Dockerfile b/Dockerfile index acd06a4..07c9c41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM registry.0xacab.org/sutty/containers/sdk:latest +FROM sutty/sdk:latest MAINTAINER "f " -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 diff --git a/rubygems-platform-musl.patch b/rubygems-platform-musl.patch index 4034704..d6db223 100644 --- a/rubygems-platform-musl.patch +++ b/rubygems-platform-musl.patch @@ -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 @@