Merge pull request #2334 from sul-dlss/update-docker-compose

Update docker-compose and Dockerfile

Dockerfile

@@ -1,12 +1,9 @@
-FROM ruby:3.2.2-alpine
+FROM ruby:3.3.2-bookworm
 
-# postgresql-client is required for invoke.sh
-RUN apk --no-cache add \
- postgresql-dev \
- postgresql-client \
- tzdata \
- libxml2-dev \
- libxslt-dev
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+ && apt-get -y install --no-install-recommends \
+ postgresql-client postgresql-contrib libpq-dev build-essential \
+ libxml2-dev libxslt-dev
 
 LABEL maintainer="Aaron Collier <aaron.collier@stanford.edu>"
 
@@ -25,10 +22,7 @@ RUN gem update --system && \
 
 COPY Gemfile Gemfile.lock ./
 
-RUN apk --no-cache add --virtual build-dependencies \
- build-base \
- && bundle install --without test\
- && apk del build-dependencies
+RUN bundle install
 
 COPY . .
 

Gemfile.lock

@@ -97,6 +97,7 @@ GEM
  aws-eventstream (~> 1, >= 1.0.2)
  base64 (0.2.0)
  bcrypt_pbkdf (1.1.1)
+ bcrypt_pbkdf (1.1.1-arm64-darwin)
  bcrypt_pbkdf (1.1.1-x86_64-darwin)
  bigdecimal (3.1.8)
  builder (3.2.4)
@@ -190,6 +191,9 @@ GEM
  net-http
  faraday-retry (2.2.1)
  faraday (~> 2.0)
+ ffi (1.17.0-aarch64-linux-gnu)
+ ffi (1.17.0-aarch64-linux-musl)
+ ffi (1.17.0-arm64-darwin)
  ffi (1.17.0-x86_64-darwin)
  ffi (1.17.0-x86_64-linux-gnu)
  globalid (1.2.1)
@@ -259,6 +263,10 @@ GEM
  net-protocol
  net-ssh (7.2.3)
  nio4r (2.7.3)
+ nokogiri (1.16.5-aarch64-linux)
+ racc (~> 1.4)
+ nokogiri (1.16.5-arm64-darwin)
+ racc (~> 1.4)
  nokogiri (1.16.5-x86_64-darwin)
  racc (~> 1.4)
  nokogiri (1.16.5-x86_64-linux)
@@ -447,6 +455,9 @@ GEM
  zeitwerk (2.6.15)
 
 PLATFORMS
+ aarch64-linux
+ aarch64-linux-musl
+ arm64-darwin-23
  x86_64-darwin-19
  x86_64-darwin-21
  x86_64-darwin-22

docker-compose.yml

@@ -5,11 +5,14 @@ services:
  build:
  context: ./
  dockerfile: Dockerfile
+ args:
+ - BUNDLE_GEMS__CONTRIBSYS__COM
  environment:
  - RAILS_LOG_TO_STDOUT=true
  - POSTGRES_HOST=db
  - REDIS_URL=redis:6379
  - RAILS_ENV=development
+ - BUNDLE_GEMS__CONTRIBSYS__COM="${BUNDLE_GEMS__CONTRIBSYS__COM}"
  volumes:
  - .:/app
  - ./tmp/pids:/app/tmp/pids