scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 09:42:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove dev packages from production Docker image, update omniauth-saml and nokogiri gems [SCI-11112] (#7896)

Browse source
This commit is contained in:
Alex Kriuchykhin 2024-09-27 13:56:32 +02:00 committed by GitHub
parent d617a4de02
commit 8552cd9600
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ruby:3.2.5-bookworm FROM ruby:3.2-bookworm
MAINTAINER SciNote <info@scinote.net> MAINTAINER SciNote <info@scinote.net>
# additional dependecies # additional dependecies

6
Dockerfile.production
View file

@ -1,5 +1,5 @@
# Building stage # Building stage
FROM ruby:3.2.5-bookworm AS builder FROM ruby:3.2-bookworm AS builder
RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
RUN \ RUN \
@ -41,7 +41,7 @@ RUN \
bash -c "rake assets:precompile && rake deface:precompile && rm -rf ./tmp/cache" bash -c "rake assets:precompile && rake deface:precompile && rm -rf ./tmp/cache"
# Final stage # Final stage
FROM ruby:3.2.5-bookworm AS runner FROM ruby:3.2-bookworm AS runner
MAINTAINER SciNote <info@scinote.net> MAINTAINER SciNote <info@scinote.net>
RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
@ -89,6 +89,8 @@ RUN \
--mount=type=cache,target=/var/lib/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \
touch /etc/build-${BUILD_TIMESTAMP} && \ touch /etc/build-${BUILD_TIMESTAMP} && \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
apt-get remove -y *-dev && \
apt-get autoremove -y && \
apt-get update -qq && \ apt-get update -qq && \
apt-get upgrade -y && \ apt-get upgrade -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

10
Gemfile.lock
View file

@ -466,12 +466,12 @@ GEM
net-protocol net-protocol
newrelic_rpm (9.2.2) newrelic_rpm (9.2.2)
nio4r (2.7.3) nio4r (2.7.3)
nokogiri (1.16.5) nokogiri (1.16.7)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.5-arm64-darwin) nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux) nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
noticed (1.6.3) noticed (1.6.3)
http (>= 4.0.0) http (>= 4.0.0)
@ -483,7 +483,7 @@ GEM
rack (>= 1.2, < 4) rack (>= 1.2, < 4)
snaky_hash (~> 2.0) snaky_hash (~> 2.0)
version_gem (~> 1.1) version_gem (~> 1.1)
omniauth (2.1.1) omniauth (2.1.2)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 2.2.3) rack (>= 2.2.3)
rack-protection rack-protection
@ -497,7 +497,7 @@ GEM
omniauth-rails_csrf_protection (1.0.1) omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2) actionpack (>= 4.2)
omniauth (~> 2.0) omniauth (~> 2.0)
omniauth-saml (2.1.2) omniauth-saml (2.2.1)
omniauth (~> 2.1) omniauth (~> 2.1)
ruby-saml (~> 1.17) ruby-saml (~> 1.17)
omniauth_openid_connect (0.7.1) omniauth_openid_connect (0.7.1)