nomad

HCL and Docker files for Nomad deployments
git clone https://git.in0rdr.ch/nomad.git
Log | Files | Refs | Pull requests

0001-fix-delete-Gemfile.lock.patch (9340B)

      1 From 2b780271fbe2e624a74f683e57724e1441afa694 Mon Sep 17 00:00:00 2001
      2 From: Andreas Gruhler <andreas.gruhler@adfinis.com>
      3 Date: Sat, 8 Oct 2022 10:12:09 +0200
      4 Subject: [PATCH] fix: delete Gemfile.lock
      5 
      6 ---
      7  Dockerfile   |   7 +-
      8  Gemfile      |   1 +
      9  Gemfile.lock | 297 ---------------------------------------------------
     10  3 files changed, 6 insertions(+), 299 deletions(-)
     11  delete mode 100644 Gemfile.lock
     12 
     13 diff --git a/Dockerfile b/Dockerfile
     14 index 2bdc62a..7512f25 100644
     15 --- a/Dockerfile
     16 +++ b/Dockerfile
     17 @@ -3,6 +3,8 @@ FROM ruby:2.6.1-alpine3.9
     18  RUN apk add --no-cache -t build-dependencies \
     19      build-base \
     20      postgresql-dev \
     21 +    libc6-compat \
     22 +    python2 \
     23    && apk add --no-cache \
     24      git \
     25      tzdata \
     26 @@ -11,13 +13,14 @@ RUN apk add --no-cache -t build-dependencies \
     27  
     28  WORKDIR /app
     29  
     30 -COPY Gemfile Gemfile.lock ./
     31 +COPY Gemfile ./
     32  
     33  ENV RAILS_ENV production
     34  ENV RACK_ENV production
     35  ENV NODE_ENV production
     36  
     37 -RUN gem install bundler && bundle install --deployment --without development test
     38 +RUN bundle config set --local without 'development test'
     39 +RUN gem install bundler && bundle install
     40  
     41  COPY . ./
     42  
     43 diff --git a/Gemfile b/Gemfile
     44 index d0aaa5d..2ecfa7a 100644
     45 --- a/Gemfile
     46 +++ b/Gemfile
     47 @@ -18,6 +18,7 @@ gem 'devise', '~> 4.5'
     48  gem 'dotenv-rails', '~> 2.6'
     49  gem 'uglifier', '~> 4.1'
     50  gem 'webpacker', '~> 4.0'
     51 +gem 'sprockets', '<4'
     52  
     53  group :development do
     54    gem 'awesome_print', '~> 1.8'
     55 diff --git a/Gemfile.lock b/Gemfile.lock
     56 deleted file mode 100644
     57 index efb03eb..0000000
     58 --- a/Gemfile.lock
     59 +++ /dev/null
     60 @@ -1,297 +0,0 @@
     61 -GEM
     62 -  remote: https://rubygems.org/
     63 -  specs:
     64 -    actioncable (5.2.3)
     65 -      actionpack (= 5.2.3)
     66 -      nio4r (~> 2.0)
     67 -      websocket-driver (>= 0.6.1)
     68 -    actionmailer (5.2.3)
     69 -      actionpack (= 5.2.3)
     70 -      actionview (= 5.2.3)
     71 -      activejob (= 5.2.3)
     72 -      mail (~> 2.5, >= 2.5.4)
     73 -      rails-dom-testing (~> 2.0)
     74 -    actionpack (5.2.3)
     75 -      actionview (= 5.2.3)
     76 -      activesupport (= 5.2.3)
     77 -      rack (~> 2.0)
     78 -      rack-test (>= 0.6.3)
     79 -      rails-dom-testing (~> 2.0)
     80 -      rails-html-sanitizer (~> 1.0, >= 1.0.2)
     81 -    actionview (5.2.3)
     82 -      activesupport (= 5.2.3)
     83 -      builder (~> 3.1)
     84 -      erubi (~> 1.4)
     85 -      rails-dom-testing (~> 2.0)
     86 -      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     87 -    active_model_serializers (0.10.9)
     88 -      actionpack (>= 4.1, < 6)
     89 -      activemodel (>= 4.1, < 6)
     90 -      case_transform (>= 0.2)
     91 -      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     92 -    activejob (5.2.3)
     93 -      activesupport (= 5.2.3)
     94 -      globalid (>= 0.3.6)
     95 -    activemodel (5.2.3)
     96 -      activesupport (= 5.2.3)
     97 -    activerecord (5.2.3)
     98 -      activemodel (= 5.2.3)
     99 -      activesupport (= 5.2.3)
    100 -      arel (>= 9.0)
    101 -    activestorage (5.2.3)
    102 -      actionpack (= 5.2.3)
    103 -      activerecord (= 5.2.3)
    104 -      marcel (~> 0.3.1)
    105 -    activesupport (5.2.3)
    106 -      concurrent-ruby (~> 1.0, >= 1.0.2)
    107 -      i18n (>= 0.7, < 2)
    108 -      minitest (~> 5.1)
    109 -      tzinfo (~> 1.1)
    110 -    addressable (2.6.0)
    111 -      public_suffix (>= 2.0.2, < 4.0)
    112 -    after_commit_action (1.1.0)
    113 -      activerecord (>= 3.0.0)
    114 -      activesupport (>= 3.0.0)
    115 -    arel (9.0.0)
    116 -    awesome_print (1.8.0)
    117 -    bcrypt (3.1.12)
    118 -    better_errors (2.5.1)
    119 -      coderay (>= 1.0.0)
    120 -      erubi (>= 1.0.0)
    121 -      rack (>= 0.9.0)
    122 -    bindex (0.6.0)
    123 -    binding_of_caller (0.8.0)
    124 -      debug_inspector (>= 0.0.1)
    125 -    bootsnap (1.4.2)
    126 -      msgpack (~> 1.0)
    127 -    builder (3.2.3)
    128 -    capybara (3.16.1)
    129 -      addressable
    130 -      mini_mime (>= 0.1.3)
    131 -      nokogiri (~> 1.8)
    132 -      rack (>= 1.6.0)
    133 -      rack-test (>= 0.6.3)
    134 -      regexp_parser (~> 1.2)
    135 -      xpath (~> 3.2)
    136 -    case_transform (0.2)
    137 -      activesupport
    138 -    childprocess (0.9.0)
    139 -      ffi (~> 1.0, >= 1.0.11)
    140 -    coderay (1.1.2)
    141 -    concurrent-ruby (1.1.5)
    142 -    counter_culture (1.12.0)
    143 -      activerecord (>= 3.0.0)
    144 -      activesupport (>= 3.0.0)
    145 -      after_commit_action (~> 1.0)
    146 -    crass (1.0.4)
    147 -    database_cleaner (1.7.0)
    148 -    debug-extras (0.4.3)
    149 -      awesome_print (>= 1.6, < 1.9)
    150 -      railties (> 4.0, < 6)
    151 -    debug_inspector (0.0.3)
    152 -    devise (4.6.2)
    153 -      bcrypt (~> 3.0)
    154 -      orm_adapter (~> 0.1)
    155 -      railties (>= 4.1.0, < 6.0)
    156 -      responders
    157 -      warden (~> 1.2.3)
    158 -    diff-lcs (1.3)
    159 -    docile (1.1.5)
    160 -    dotenv (2.7.2)
    161 -    dotenv-rails (2.7.2)
    162 -      dotenv (= 2.7.2)
    163 -      railties (>= 3.2, < 6.1)
    164 -    erubi (1.8.0)
    165 -    execjs (2.7.0)
    166 -    factory_bot (4.11.1)
    167 -      activesupport (>= 3.0.0)
    168 -    factory_bot_rails (4.11.1)
    169 -      factory_bot (~> 4.11.1)
    170 -      railties (>= 3.0.0)
    171 -    faker (1.9.3)
    172 -      i18n (>= 0.7)
    173 -    ffi (1.10.0)
    174 -    globalid (0.4.2)
    175 -      activesupport (>= 4.2.0)
    176 -    i18n (1.6.0)
    177 -      concurrent-ruby (~> 1.0)
    178 -    json (2.2.0)
    179 -    jsonapi-renderer (0.2.0)
    180 -    listen (3.1.5)
    181 -      rb-fsevent (~> 0.9, >= 0.9.4)
    182 -      rb-inotify (~> 0.9, >= 0.9.7)
    183 -      ruby_dep (~> 1.2)
    184 -    loofah (2.2.3)
    185 -      crass (~> 1.0.2)
    186 -      nokogiri (>= 1.5.9)
    187 -    mail (2.7.1)
    188 -      mini_mime (>= 0.1.1)
    189 -    marcel (0.3.3)
    190 -      mimemagic (~> 0.3.2)
    191 -    method_source (0.9.2)
    192 -    mimemagic (0.3.3)
    193 -    mini_mime (1.0.1)
    194 -    mini_portile2 (2.4.0)
    195 -    minitest (5.11.3)
    196 -    msgpack (1.2.9)
    197 -    nio4r (2.3.1)
    198 -    nokogiri (1.10.3)
    199 -      mini_portile2 (~> 2.4.0)
    200 -    orm_adapter (0.5.0)
    201 -    pg (1.1.4)
    202 -    pry (0.12.2)
    203 -      coderay (~> 1.1.0)
    204 -      method_source (~> 0.9.0)
    205 -    pry-rails (0.3.9)
    206 -      pry (>= 0.10.4)
    207 -    public_suffix (3.0.3)
    208 -    puma (3.12.1)
    209 -    rack (2.0.7)
    210 -    rack-proxy (0.6.5)
    211 -      rack
    212 -    rack-test (1.1.0)
    213 -      rack (>= 1.0, < 3)
    214 -    rails (5.2.3)
    215 -      actioncable (= 5.2.3)
    216 -      actionmailer (= 5.2.3)
    217 -      actionpack (= 5.2.3)
    218 -      actionview (= 5.2.3)
    219 -      activejob (= 5.2.3)
    220 -      activemodel (= 5.2.3)
    221 -      activerecord (= 5.2.3)
    222 -      activestorage (= 5.2.3)
    223 -      activesupport (= 5.2.3)
    224 -      bundler (>= 1.3.0)
    225 -      railties (= 5.2.3)
    226 -      sprockets-rails (>= 2.0.0)
    227 -    rails-controller-testing (1.0.4)
    228 -      actionpack (>= 5.0.1.x)
    229 -      actionview (>= 5.0.1.x)
    230 -      activesupport (>= 5.0.1.x)
    231 -    rails-dom-testing (2.0.3)
    232 -      activesupport (>= 4.2.0)
    233 -      nokogiri (>= 1.6)
    234 -    rails-html-sanitizer (1.0.4)
    235 -      loofah (~> 2.2, >= 2.2.2)
    236 -    railties (5.2.3)
    237 -      actionpack (= 5.2.3)
    238 -      activesupport (= 5.2.3)
    239 -      method_source
    240 -      rake (>= 0.8.7)
    241 -      thor (>= 0.19.0, < 2.0)
    242 -    rake (12.3.2)
    243 -    rb-fsevent (0.10.3)
    244 -    rb-inotify (0.10.0)
    245 -      ffi (~> 1.0)
    246 -    regexp_parser (1.4.0)
    247 -    responders (2.4.1)
    248 -      actionpack (>= 4.2.0, < 6.0)
    249 -      railties (>= 4.2.0, < 6.0)
    250 -    rspec-core (3.8.0)
    251 -      rspec-support (~> 3.8.0)
    252 -    rspec-expectations (3.8.2)
    253 -      diff-lcs (>= 1.2.0, < 2.0)
    254 -      rspec-support (~> 3.8.0)
    255 -    rspec-mocks (3.8.0)
    256 -      diff-lcs (>= 1.2.0, < 2.0)
    257 -      rspec-support (~> 3.8.0)
    258 -    rspec-rails (3.8.2)
    259 -      actionpack (>= 3.0)
    260 -      activesupport (>= 3.0)
    261 -      railties (>= 3.0)
    262 -      rspec-core (~> 3.8.0)
    263 -      rspec-expectations (~> 3.8.0)
    264 -      rspec-mocks (~> 3.8.0)
    265 -      rspec-support (~> 3.8.0)
    266 -    rspec-support (3.8.0)
    267 -    ruby_dep (1.5.0)
    268 -    rubyzip (1.2.2)
    269 -    selenium-webdriver (3.141.0)
    270 -      childprocess (~> 0.5)
    271 -      rubyzip (~> 1.2, >= 1.2.2)
    272 -    shoulda-matchers (3.1.3)
    273 -      activesupport (>= 4.0.0)
    274 -    simplecov (0.14.1)
    275 -      docile (~> 1.1.0)
    276 -      json (>= 1.8, < 3)
    277 -      simplecov-html (~> 0.10.0)
    278 -    simplecov-html (0.10.2)
    279 -    spring (2.0.2)
    280 -      activesupport (>= 4.2)
    281 -    spring-watcher-listen (2.0.1)
    282 -      listen (>= 2.7, < 4.0)
    283 -      spring (>= 1.2, < 3.0)
    284 -    sprockets (3.7.2)
    285 -      concurrent-ruby (~> 1.0)
    286 -      rack (> 1, < 3)
    287 -    sprockets-rails (3.2.1)
    288 -      actionpack (>= 4.0)
    289 -      activesupport (>= 4.0)
    290 -      sprockets (>= 3.0.0)
    291 -    thor (0.20.3)
    292 -    thread_safe (0.3.6)
    293 -    tzinfo (1.2.5)
    294 -      thread_safe (~> 0.1)
    295 -    uglifier (4.1.20)
    296 -      execjs (>= 0.3.0, < 3)
    297 -    warden (1.2.8)
    298 -      rack (>= 2.0.6)
    299 -    web-console (3.7.0)
    300 -      actionview (>= 5.0)
    301 -      activemodel (>= 5.0)
    302 -      bindex (>= 0.4.0)
    303 -      railties (>= 5.0)
    304 -    webdrivers (3.8.0)
    305 -      nokogiri (~> 1.6)
    306 -      rubyzip (~> 1.0)
    307 -      selenium-webdriver (~> 3.0)
    308 -    webpacker (4.0.7)
    309 -      activesupport (>= 4.2)
    310 -      rack-proxy (>= 0.6.1)
    311 -      railties (>= 4.2)
    312 -    websocket-driver (0.7.0)
    313 -      websocket-extensions (>= 0.1.0)
    314 -    websocket-extensions (0.1.3)
    315 -    xpath (3.2.0)
    316 -      nokogiri (~> 1.8)
    317 -
    318 -PLATFORMS
    319 -  ruby
    320 -
    321 -DEPENDENCIES
    322 -  active_model_serializers (~> 0.10.8)
    323 -  awesome_print (~> 1.8)
    324 -  better_errors (~> 2.4)
    325 -  binding_of_caller (~> 0.8.0)
    326 -  bootsnap (~> 1.3)
    327 -  capybara (~> 3.15)
    328 -  counter_culture (~> 1.12)
    329 -  database_cleaner (~> 1.7)
    330 -  debug-extras
    331 -  devise (~> 4.5)
    332 -  dotenv-rails (~> 2.6)
    333 -  factory_bot_rails (~> 4.11)
    334 -  faker (~> 1.9)
    335 -  listen (~> 3.1)
    336 -  pg (~> 1.1, >= 1.1.4)
    337 -  pry-rails
    338 -  puma (~> 3.12)
    339 -  rails (~> 5.2, >= 5.2.3)
    340 -  rails-controller-testing (~> 1.0)
    341 -  rspec-rails (~> 3.8)
    342 -  selenium-webdriver (~> 3.13)
    343 -  shoulda-matchers (~> 3.1)
    344 -  simplecov (~> 0.14.1)
    345 -  spring
    346 -  spring-watcher-listen (~> 2.0)
    347 -  tzinfo-data
    348 -  uglifier (~> 4.1)
    349 -  web-console (~> 3.7)
    350 -  webdrivers (~> 3.0)
    351 -  webpacker (~> 4.0)
    352 -
    353 -RUBY VERSION
    354 -   ruby 2.6.1p33
    355 -
    356 -BUNDLED WITH
    357 -   1.17.2
    358 -- 
    359 2.37.3
    360