Merge pull request #264 from scientist-softserv/docker_facelift

Docker facelift

.github/workflows/base.yaml

@@ -0,0 +1,18 @@
+name: "Build Base"
+on:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        required: false
+        default: false
+
+jobs:
+  build:
+    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    secrets: inherit
+    with:
+      platforms: "linux/amd64"
+      target: hyku-base
+

.github/workflows/build-lint-test-action.yaml

@@ -21,7 +21,7 @@ jobs:
     secrets: inherit
     with:
       platforms: "linux/amd64"
-      target: hyku-base
+      target: hyku-web
       worker: true
       workerTarget: hyku-worker
   test:

Dockerfile

@@ -1,4 +1,4 @@
-ARG HYRAX_IMAGE_VERSION=3.1.0
+ARG HYRAX_IMAGE_VERSION=v4.0.0.beta2
 FROM ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_IMAGE_VERSION as hyku-base
 
 USER root
@@ -7,48 +7,95 @@ RUN apk --no-cache upgrade && \
   apk --no-cache add \
     bash \
     cmake \
+    exiftool \
     ffmpeg \
     git \
+    imagemagick \
     less \
     libreoffice \
     libreoffice-lang-uk \
     libxml2-dev \
     mediainfo \
     nodejs \
-    openjdk11-jre \
+    openjdk17-jre \
+    openjpeg-dev \
+    openjpeg-tools \
     perl \
+    poppler \
+    poppler-utils \
     postgresql-client \
     rsync \
+    screen \
+    tesseract-ocr \
     vim \
-    yarn
+    yarn \
+  && \
+  # curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+  # source "$HOME/.cargo/env" && \
+  # cargo install rbspy && \
+  echo "******** Packages Installed *********"
+
+RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-57.tar.gz \
+    && tar xf 7.1.0-57.tar.gz \
+    && apk --no-cache add \
+      libjpeg-turbo openjpeg libpng tiff librsvg libgsf libimagequant poppler-qt5-dev \
+    && cd ImageMagick* \
+    && ./configure \
+    && make install \
+    && cd $OLDPWD \
+    && rm -rf ImageMagick* \
+    && rm -rf /var/cache/apk/*
+
+ARG VIPS_VERSION=8.11.3
+
+RUN set -x -o pipefail \
+    && wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz | tar xzC /tmp \
+    && apk --no-cache add \
+     libjpeg-turbo openjpeg libpng tiff librsvg libgsf libimagequant poppler-qt5-dev \
+    && apk add --virtual vips-dependencies build-base \
+     libjpeg-turbo-dev libpng-dev tiff-dev librsvg-dev libgsf-dev libimagequant-dev \
+    && cd /tmp/vips-${VIPS_VERSION} \
+    && ./configure --prefix=/usr \
+                   --disable-static \
+                   --disable-dependency-tracking \
+                   --enable-silent-rules \
+    && make -s install-strip \
+    && cd $OLDPWD \
+    && rm -rf /tmp/vips-${VIPS_VERSION} \
+    && apk del --purge vips-dependencies \
+    && rm -rf /var/cache/apk/*
 
 USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.0/fits-1.5.0.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.5.5/fits-1.5.5.zip -O fits.zip && \
     unzip fits.zip && \
     rm fits.zip && \
     chmod a+x /app/fits/fits.sh
 ENV PATH="${PATH}:/app/fits"
 # Change the order so exif tool is better positioned and use the biggest size if more than one
 # size exists in an image file (pyramidal tifs mostly)
-COPY --chown=1001:101 $APP_PATH/ops/fits.xml /app/fits/xml/fits.xml
-COPY --chown=1001:101 $APP_PATH/ops/exiftool_image_to_fits.xslt /app/fits/xml/exiftool/exiftool_image_to_fits.xslt
+COPY --chown=1001:101 ./ops/fits.xml /app/fits/xml/fits.xml
+COPY --chown=1001:101 ./ops/exiftool_image_to_fits.xslt /app/fits/xml/exiftool/exiftool_image_to_fits.xslt
 RUN ln -sf /usr/lib/libmediainfo.so.0 /app/fits/tools/mediainfo/linux/libmediainfo.so.0 && \
   ln -sf /usr/lib/libzen.so.0 /app/fits/tools/mediainfo/linux/libzen.so.0
 
+FROM hyku-base as hyku-web
+
 COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
-RUN bundle install --jobs "$(nproc)"
+RUN sh -l -c " \
+  bundle install --jobs "$(nproc)" && \
+  sed -i '/require .enumerator./d' /usr/local/bundle/gems/oai-1.1.0/lib/oai/provider/resumption_token.rb && \
+  sed -i '/require .enumerator./d' /usr/local/bundle/gems/edtf-3.0.7/lib/edtf.rb && \
+  sed -i '/require .enumerator./d' /usr/local/bundle/gems/csl-1.6.0/lib/csl.rb"
 COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/
-
 COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 
 ARG HYKU_BULKRAX_ENABLED="true"
-RUN sh -l -c " \
-  yarn install && \
-  RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile"
+RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+CMD ./bin/web
 
-FROM hyku-base as hyku-worker
+FROM hyku-web as hyku-worker
 ENV MALLOC_ARENA_MAX=2
-CMD bundle exec sidekiq
+CMD ./bin/worker

bin/web

@@ -0,0 +1,6 @@
+#!/usr/local/bin/ruby
+if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty?
+  %x{echo #{ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE']} | base64 --decode > prod-cred.p12}
+end
+
+exec "bundle exec puma -v -b tcp://0.0.0.0:3000"

bin/worker

@@ -0,0 +1,12 @@
+#!/usr/local/bin/ruby
+if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty?
+  %x{echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12}
+end
+
+if ENV['DATABASE_URL'] && !ENV['DATABASE_URL'].empty?
+  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].gsub('pool=5', 'pool=30')
+else
+  puts 'DATABASE_URL not set, no pool change needed'
+end
+
+exec "echo $DATABASE_URL && bundle exec sidekiq"

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.8'
 x-app: &app
   build:
     context: .
-    target: hyku-base
+    target: hyku-web
     args:
       - HYKU_BULKRAX_ENABLED=true
   # command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000"
@@ -12,6 +12,7 @@ x-app: &app
     - .env
   # NOTE: all common env variables moved to .env
   volumes:
+    - node_modules:/app/samvera/hyrax-webapp/node_modules:cached
     - uploads:/app/samvera/hyrax-webapp/public/uploads:cached
     - assets:/app/samvera/hyrax-webapp/public/assets:cached
     - cache:/app/samvera/hyrax-webapp/tmp/cache:cached
@@ -24,6 +25,7 @@ volumes:
   cache:
   db:
   fcrepo:
+  node_modules:
   redis:
   solr:
   uploads:
@@ -116,6 +118,14 @@ services:
     networks:
       internal:
 
+  # Used exclusively for building and caching the base image to reduce build times
+  base:
+    <<: *app
+    image: ghcr.io/scientist-softserv/britishlibrary/base:${TAG:-latest}
+    build:
+      context: .
+      target: hyku-base
+
   web:
     <<: *app
     environment: