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.

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

Bump dockerfile alpine and ruby versions #6205

Merged
merged 2 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 6 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
ARG RUBY_VERSION=3.2.1
ARG ALPINE_VERSION=3.18
ARG RUBY_VERSION=3.2.2

# 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-alpine$ALPINE_VERSION as builder
RUN apk add build-base curl jemalloc

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

ARG DATABASE_APK_PACKAGE="postgresql-dev"
ARG EXTRA_APK_PACKAGES="git"
Expand Down Expand Up @@ -43,7 +38,7 @@ 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/
COPY --from=builder /usr/lib/libjemalloc.so.2 /usr/local/lib/
ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"

ENTRYPOINT ["hyrax-entrypoint.sh"]
Expand Down
4 changes: 4 additions & 0 deletions docker-compose-koppie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ services:
volumes:
- solr_home:/var/solr/data:cached
- .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf
ulimits:
nofile:
soft: 65536
hard: 524288
networks:
- koppie

Expand Down
4 changes: 4 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ services:
volumes:
- solr_home:/var/solr/data:cached
- .dassie/solr/conf:/opt/solr/server/configsets/hyraxconf
ulimits:
nofile:
soft: 65536
hard: 524288
networks:
- hyrax

Expand Down