Skip to content

Commit 77652c0

Browse files
authored
NODE_OPTIONS=--openssl-legacy-providerを再度追加 (#1910)
* use nodejs 20.x again * use sprockers 4.2
1 parent 4645484 commit 77652c0

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

.env.template

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ ENJU_LEAF_EXTRACT_FILESIZE_LIMIT=2097152
2828

2929
CANTALOUPE_BASE_URL=http://localhost:8182
3030

31+
NODE_OPTIONS=--openssl-legacy-provider
32+
3133
no_proxy=localhost,webpacker,minio,solr,tika
3234
NO_PROXY=${no_proxy}
3335

.github/workflows/rubyonrails.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ jobs:
2828
POSTGRES_USER: rails
2929
POSTGRES_PASSWORD: password
3030
CC_TEST_REPORTER_ID: c193cb8ea058a7d62fd62d6d05adaaf95f6bdf882c1039500b30b54494a36e52
31+
NODE_OPTIONS: --openssl-legacy-provider
3132
steps:
3233
- name: Checkout code
3334
uses: actions/checkout@v4
3435
- name: Setup node
3536
uses: actions/setup-node@v4
3637
with:
37-
node-version: 16
38+
node-version: 20
3839
# Add or replace dependency steps here
3940
- name: Install Ruby and gems
4041
uses: ruby/setup-ruby@v1

Dockerfile

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
44
ARG RUBY_VERSION=3.2.5
55
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
6-
ARG NODE_VERSION=16.20.2-1nodesource1
76

87
# Rails app lives here
98
WORKDIR /enju
@@ -17,17 +16,16 @@ ENV RAILS_ENV="production" \
1716

1817
# Throw-away build stage to reduce size of final image
1918
FROM base as build
20-
ARG NODE_VERSION=16.20.2-1nodesource1
2119

2220
# Install packages needed to build gems
2321
RUN apt-get update -qq && apt-get install --no-install-recommends -y curl gnupg && \
2422
mkdir -p /etc/apt/keyrings && \
2523
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
2624
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarnkey.gpg && \
27-
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
25+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
2826
echo "deb [signed-by=/etc/apt/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2927
apt-get update -qq && \
30-
apt-get install --no-install-recommends -y build-essential git libpq-dev libvips pkg-config nodejs=${NODE_VERSION} yarn
28+
apt-get install --no-install-recommends -y build-essential git libpq-dev libvips pkg-config nodejs yarn
3129

3230
# Install application gems
3331
COPY Gemfile Gemfile.lock ./
@@ -43,6 +41,7 @@ COPY . .
4341
RUN bundle exec bootsnap precompile app/ lib/
4442

4543
# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
44+
ARG NODE_OPTIONS=--openssl-legacy-provider
4645
RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
4746

4847

@@ -58,10 +57,10 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -y curl gnupg
5857
mkdir -p /etc/apt/keyrings && \
5958
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
6059
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarnkey.gpg && \
61-
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
60+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
6261
echo "deb [signed-by=/etc/apt/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \
6362
apt-get update -qq && \
64-
apt-get install --no-install-recommends -y libvips postgresql-client nodejs=${NODE_VERSION} yarn && \
63+
apt-get install --no-install-recommends -y libvips postgresql-client nodejs yarn && \
6564
rm -rf /var/lib/apt/lists /var/cache/apt/archives
6665

6766
# Copy built artifacts: gems, application

Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ gem 'rdf-turtle', require: 'rdf/turtle'
109109
gem 'rdf-vocab', require: 'rdf/vocab'
110110
gem 'oai'
111111
gem 'active_storage_validations'
112-
gem 'sprockets', '~> 3.7'
113112
gem 'webpacker', '~> 5.0'
114113
gem 'faraday-multipart'
115114

Gemfile.lock

+8-10
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,16 @@ GEM
308308
activesupport (>= 3.0.0)
309309
raabro (1.4.0)
310310
racc (1.8.1)
311-
rack (2.2.9)
311+
rack (3.1.7)
312312
rack-proxy (0.7.7)
313313
rack
314-
rack-session (1.0.2)
315-
rack (< 3)
314+
rack-session (2.0.0)
315+
rack (>= 3.0.0)
316316
rack-test (2.1.0)
317317
rack (>= 1.3)
318-
rackup (1.0.0)
319-
rack (< 3)
320-
webrick
318+
rackup (2.1.0)
319+
rack (>= 3)
320+
webrick (~> 1.8)
321321
rails (7.1.4)
322322
actioncable (= 7.1.4)
323323
actionmailbox (= 7.1.4)
@@ -449,10 +449,9 @@ GEM
449449
concurrent-ruby (>= 1.3.1)
450450
fugit (~> 1.11.0)
451451
railties (>= 7.1)
452-
sprockets (3.7.3)
453-
base64
452+
sprockets (4.2.1)
454453
concurrent-ruby (~> 1.0)
455-
rack (> 1, < 3)
454+
rack (>= 2.2.4, < 4)
456455
sprockets-rails (3.5.2)
457456
actionpack (>= 6.1)
458457
activesupport (>= 6.1)
@@ -580,7 +579,6 @@ DEPENDENCIES
580579
simplecov
581580
sitemap_generator
582581
solid_queue
583-
sprockets (~> 3.7)
584582
sprockets-rails
585583
statesman (~> 12.1)
586584
strip_attributes

app/assets/config/manifest.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
//= link_tree ../images
22
//= link_directory ../javascripts .js
33
//= link_directory ../stylesheets .css
4+
//= link application.css
5+
//= link application.js
6+
//= link mobile.css
7+
//= link mobile.js

0 commit comments

Comments
 (0)