From 7d2288ae481fdf7f1992bacf292f7f43f4697f9f Mon Sep 17 00:00:00 2001 From: fauno Date: Mon, 26 Apr 2021 16:04:55 +0000 Subject: [PATCH] usar hain como entorno de trabajo reproducible --- .ruby-version | 2 +- Gemfile | 15 ++------------- Gemfile.lock | 39 ++++++++++++++++++++++++++++++++++++++- Makefile | 11 +++++++---- 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/.ruby-version b/.ruby-version index 860487c..bec3a35 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.1 +system diff --git a/Gemfile b/Gemfile index 56b6ab9..63b921c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,7 @@ # frozen_string_literal: true -# TODO: Podríamos usar solo gems.sutty.nl pero por alguna razón bundler -# prefiere x86_64-linux-musl antes que x86_64-linux y ya perdimos mucho -# tiempo buscando soporte para musl -if ENV['RAILS_ENV'] == 'production' - source 'https://gems.sutty.nl' -else - source 'https://rubygems.org' -end - -git_source(:github) do |repo_name| - repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/') - "https://github.com/#{repo_name}.git" -end +puts 'Usa haini.sh para generar un entorno de trabajo reproducible' +source 'https://gems.sutty.nl' ruby '~> 2.7' diff --git a/Gemfile.lock b/Gemfile.lock index a9ab731..5c1d062 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,9 +92,12 @@ GEM autoprefixer-rails (10.2.4.0) execjs bcrypt (3.1.16) + bcrypt (3.1.16-x86_64-linux-musl) bcrypt_pbkdf (1.1.0) + bcrypt_pbkdf (1.1.0-x86_64-linux-musl) benchmark-ips (2.8.4) bindex (0.8.1) + bindex (0.8.1-x86_64-linux-musl) blazer (2.4.2) activerecord (>= 5) chartkick (>= 3.2) @@ -119,9 +122,13 @@ GEM colorator (1.1.0) commonmarker (0.21.2) ruby-enum (~> 0.5) + commonmarker (0.21.2-x86_64-linux-musl) + ruby-enum (~> 0.5) concurrent-ruby (1.1.8) concurrent-ruby-ext (1.1.8) concurrent-ruby (= 1.1.8) + concurrent-ruby-ext (1.1.8-x86_64-linux-musl) + concurrent-ruby (= 1.1.8) crass (1.0.6) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) @@ -160,6 +167,7 @@ GEM down (5.2.0) addressable (~> 2.5) ed25519 (1.2.4) + ed25519 (1.2.4-x86_64-linux-musl) editorial-autogestiva-jekyll-theme (0.3.0) jekyll (~> 4) jekyll-commonmark (~> 1.3) @@ -185,6 +193,7 @@ GEM errbase (0.2.1) erubi (1.10.0) eventmachine (1.2.7) + eventmachine (1.2.7-x86_64-linux-musl) exception_notification (4.4.3) actionmailer (>= 4.0, < 7) activesupport (>= 4.0, < 7) @@ -195,8 +204,11 @@ GEM factory_bot (~> 6.1.0) railties (>= 5.0.0) fast_blank (1.0.0) + fast_blank (1.0.0-x86_64-linux-musl) fast_jsonparser (0.5.0) + fast_jsonparser (0.5.0-x86_64-linux-musl) ffi (1.15.0) + ffi (1.15.0-x86_64-linux-musl) flamegraph (0.9.5) forwardable-extended (2.6.0) friendly_id (5.4.2) @@ -220,6 +232,10 @@ GEM temple (>= 0.8.2) thor tilt + hamlit (2.15.0-x86_64-linux-musl) + temple (>= 0.8.2) + thor + tilt hamlit-rails (0.2.3) actionpack (>= 4.0.1) activesupport (>= 4.0.1) @@ -228,7 +244,9 @@ GEM heapy (0.2.0) thor hiredis (0.6.3) + hiredis (0.6.3-x86_64-linux-musl) http_parser.rb (0.6.0) + http_parser.rb (0.6.0-x86_64-linux-musl) httparty (0.18.1) mime-types (~> 3.0) multi_xml (>= 0.5.2) @@ -354,9 +372,13 @@ GEM net-ssh (6.1.0) netaddr (2.0.4) nio4r (2.5.7) + nio4r (2.5.7-x86_64-linux-musl) nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) + nokogiri (1.11.3-x86_64-linux-musl) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) orm_adapter (0.5.0) parallel (1.20.1) parser (3.0.1.0) @@ -364,6 +386,7 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) pg (1.2.3) + pg (1.2.3-x86_64-linux-musl) popper_js (1.16.0) prometheus_exporter (0.7.0) webrick @@ -373,9 +396,12 @@ GEM public_suffix (4.0.6) puma (5.2.2) nio4r (~> 2.0) + puma (5.2.2-x86_64-linux-musl) + nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) racc (1.5.2) + racc (1.5.2-x86_64-linux-musl) rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) @@ -492,6 +518,7 @@ GEM ruby-enum (0.9.0) i18n ruby-filemagic (0.7.2) + ruby-filemagic (0.7.2-x86_64-linux-musl) ruby-progressbar (1.11.0) ruby-statistics (2.1.3) ruby-vips (2.1.0) @@ -499,11 +526,14 @@ GEM ruby_dep (1.5.0) rubyzip (2.3.0) rugged (1.1.0) + rugged (1.1.0-x86_64-linux-musl) safe_yaml (1.0.6) safely_block (0.3.0) errbase (>= 0.1.1) sassc (2.4.0) ffi (~> 1.9) + sassc (2.4.0-x86_64-linux-musl) + ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) @@ -540,7 +570,9 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) + sqlite3 (1.4.2-x86_64-linux-musl) stackprof (0.2.16) + stackprof (0.2.16-x86_64-linux-musl) sucker_punch (3.0.1) concurrent-ruby (~> 1.0) sutty-archives (2.5.4) @@ -570,6 +602,7 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) symbol-fstring (1.0.0) + symbol-fstring (1.0.0-x86_64-linux-musl) sysexits (1.2.0) temple (0.8.2) terminal-table (2.0.0) @@ -587,6 +620,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) + unf_ext (0.0.7.7-x86_64-linux-musl) unicode-display_width (1.7.0) validates_hostname (1.0.11) activerecord (>= 3.0) @@ -606,6 +640,8 @@ GEM webrick (1.7.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) + websocket-driver (0.7.3-x86_64-linux-musl) + websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) @@ -613,6 +649,7 @@ GEM PLATFORMS ruby + x86_64-linux-musl DEPENDENCIES adhesiones-jekyll-theme @@ -706,4 +743,4 @@ RUBY VERSION ruby 2.7.1p83 BUNDLED WITH - 2.1.4 + 2.2.2 diff --git a/Makefile b/Makefile index f05e9cc..c93d473 100644 --- a/Makefile +++ b/Makefile @@ -7,21 +7,24 @@ delegate := athshe assets := package.json yarn.lock $(shell find app/assets/ app/javascript/ -type f) -alpine_version := 3.12 +alpine_version := 3.13 +hain ?= ../haini.sh/haini.sh + +export public/packs/manifest.json.br: $(assets) - PANEL_URL=https://panel.sutty.nl RAILS_ENV=production NODE_ENV=production bundle exec rake assets:precompile assets:clean + $(hain) 'cd /Sutty/sutty; PANEL_URL=https://panel.sutty.nl RAILS_ENV=production NODE_ENV=production bundle exec rake assets:precompile assets:clean' assets: public/packs/manifest.json.br serve: /etc/hosts - bundle exec rails s -b "ssl://0.0.0.0:3000?key=../sutty.local/domain/$(SUTTY).key&cert=../sutty.local/domain/$(SUTTY).crt" + $(hain) 'cd /Sutty/sutty; bundle exec rails s -b "ssl://0.0.0.0:3000?key=../sutty.local/domain/$(SUTTY).key&cert=../sutty.local/domain/$(SUTTY).crt"' # Servir JS con el dev server. # Esto acelera la compilación del javascript, tiene que correrse por separado # de serve. serve-js: /etc/hosts - bundle exec ./bin/webpack-dev-server + $(hain) 'cd /Sutty/sutty; bundle exec ./bin/webpack-dev-server' # Limpiar los archivos de testeo clean: