scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 21:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Clean and update JS dependencies, update Rack gem [SCI-7953] (#5115)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-03-09 14:25:12 +01:00 • committed by GitHub
parent 87153b8899
commit 92d7fbb351
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 569 additions and 472 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -1,5 +1,5 @@
FROM ruby:2.7.6-bullseye FROM ruby:2.7.6-bullseye
MAINTAINER BioSistemika <info@biosistemika.com> MAINTAINER SciNote <info@scinote.net>
ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb
@ -31,9 +31,6 @@ RUN apt-get update -qq && \
ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so && \ ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# heroku tools
RUN wget -O- https://toolbelt.heroku.com/install-ubuntu.sh | sh
ENV BUNDLE_PATH /usr/local/bundle/ ENV BUNDLE_PATH /usr/local/bundle/
# create app directory # create app directory

3
Dockerfile.production
View file

@ -1,5 +1,5 @@
FROM ruby:2.7.6-bullseye FROM ruby:2.7.6-bullseye
MAINTAINER BioSistemika <info@biosistemika.com> MAINTAINER SciNote <info@scinote.net>
ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb
@ -50,7 +50,6 @@ COPY . .
RUN rm -f $APP_HOME/config/application.yml $APP_HOME/production.env RUN rm -f $APP_HOME/config/application.yml $APP_HOME/production.env
RUN DATABASE_URL=postgresql://postgres@db/scinote_production \ RUN DATABASE_URL=postgresql://postgres@db/scinote_production \
PAPERCLIP_HASH_SECRET=dummy \
SECRET_KEY_BASE=dummy \ SECRET_KEY_BASE=dummy \
DEFACE_ENABLED=true \ DEFACE_ENABLED=true \
bash -c "rake assets:precompile && rake deface:precompile" bash -c "rake assets:precompile && rake deface:precompile"

2
Gemfile.lock
View file

@ -468,7 +468,7 @@ GEM
nio4r (~> 2.0) nio4r (~> 2.0)
raabro (1.4.0) raabro (1.4.0)
racc (1.6.2) racc (1.6.2)
rack (2.2.6.2) rack (2.2.6.3)
rack-attack (6.4.0) rack-attack (6.4.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-cors (1.1.1) rack-cors (1.1.1)

1
package.json
View file

@ -68,7 +68,6 @@
"css-loader": "2.1.1", "css-loader": "2.1.1",
"decimal.js": "^10.3.1", "decimal.js": "^10.3.1",
"extract-text-webpack-plugin": "^3.0.2", "extract-text-webpack-plugin": "^3.0.2",
"fabric": "1.6.7",
"file-loader": "^4.0.0", "file-loader": "^4.0.0",
"glob": "^7.1.2", "glob": "^7.1.2",
"immutability-helper": "^2.7.1", "immutability-helper": "^2.7.1",

1030
yarn.lock
View file

File diff suppressed because it is too large Load diff