Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dockerfile revisions #5994

Merged
merged 5 commits into from
Mar 29, 2023
Merged

Dockerfile revisions #5994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1f9631
Build and enable jemalloc
dlpierce Mar 27, 2023
5a2a105
Update Alpine and Ruby
dlpierce Mar 27, 2023
0bb4ace
Unpin default rubygems/bundler version
dlpierce Mar 27, 2023
b92b85c
Update FITS, use system mediainfo, disable Tika for performance
dlpierce Mar 27, 2023
3d9d78e
Update ruby in dassie and koppie
dlpierce Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dassie/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else
end
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.6'
ruby '2.7.7'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0'
Expand Down
2 changes: 1 addition & 1 deletion .koppie/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ else
end
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.6'
ruby '2.7.7'

gem 'bootsnap', '>= 1.1.0', require: false
gem 'bootstrap', '~> 4.0'
Expand Down
26 changes: 20 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
ARG RUBY_VERSION=2.7.6
FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
ARG RUBY_VERSION=2.7.7

# Replace with official jemalloc package in alpine 3.17
FROM ruby:$RUBY_VERSION-alpine3.16 as builder
RUN apk add build-base curl
RUN curl -sL https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 | tar -xj && \
cd jemalloc-5.3.0 && \
./configure && \
make && \
make install

FROM ruby:$RUBY_VERSION-alpine3.16 as hyrax-base

ARG DATABASE_APK_PACKAGE="postgresql-dev"
ARG EXTRA_APK_PACKAGES="git"
ARG RUBYGEMS_VERSION=3.3.20
ARG RUBYGEMS_VERSION=""

RUN apk --no-cache upgrade && \
apk --no-cache add acl \
Expand Down Expand Up @@ -33,6 +43,9 @@ ENV PATH="/app/samvera:$PATH"
ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
ENV RAILS_SERVE_STATIC_FILES="1"

COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/
ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"

ENTRYPOINT ["hyrax-entrypoint.sh"]
CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]

Expand Down Expand Up @@ -61,10 +74,11 @@ USER app

RUN mkdir -p /app/fits && \
cd /app/fits && \
wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
wget https://github.com/harvard-lts/fits/releases/download/1.6.0/fits-1.6.0.zip -O fits.zip && \
unzip fits.zip && \
rm fits.zip && \
chmod a+x /app/fits/fits.sh
rm fits.zip tools/mediainfo/linux/libmediainfo.so.0 tools/mediainfo/linux/libzen.so.0 && \
chmod a+x /app/fits/fits.sh && \
sed -i 's/\(<tool.*TikaTool.*>\)/<!--\1-->/' /app/fits/xml/fits.xml
ENV PATH="${PATH}:/app/fits"

CMD bundle exec sidekiq
Expand Down