Skip to content

Commit

Permalink
Merge pull request #5308 from avalonmediasystem/node_webpack_upgrade
Browse files Browse the repository at this point in the history
Node and webpack upgrade using shakapacker
  • Loading branch information
cjcolvar authored Aug 21, 2023
2 parents 1be8107 + e78e5eb commit 268e0d7
Show file tree
Hide file tree
Showing 12 changed files with 2,311 additions and 4,491 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN echo "deb http://ftp.us.debian.org/debian/ bullseye main cont
&& echo "deb-src http://ftp.us.debian.org/debian/ bullseye main contrib non-free" >> /etc/apt/sources.list.d/bullseye.list \
&& cat /etc/apt/sources.list.d/bullseye.list \
&& apt-get update && apt-get install -y --no-install-recommends curl gnupg2 ffmpeg \
&& curl -sL http://deb.nodesource.com/setup_14.x | bash - \
&& curl -sL http://deb.nodesource.com/setup_20.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
&& cat /etc/apt/sources.list.d/nodesource.list \
Expand Down Expand Up @@ -111,7 +111,7 @@ RUN bundle config set --local without 'development test' \


# Install node modules
FROM node:14-bullseye-slim as node-modules
FROM node:20-bullseye-slim as node-modules
LABEL stage=build
LABEL project=avalon
RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gem 'sass', '3.4.22'
gem 'sprockets-es6'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker'
gem 'shakapacker'

# Core Samvera
gem 'active-fedora', '~> 14.0', '>= 14.0.1'
Expand Down
Loading

0 comments on commit 268e0d7

Please sign in to comment.