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

Update base image #2268

Closed
wants to merge 2 commits into from
Closed

Update base image #2268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b74fe75
WIP
ShanaLMoore Jul 18, 2024
4094d05
Update dockerfile to support hyrax-v5.0.1
ShanaLMoore Jul 18, 2024
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
35 changes: 20 additions & 15 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG HYRAX_IMAGE_VERSION=hyrax-v5.0.0.rc1
ARG HYRAX_IMAGE_VERSION=hyrax-v5.0.1
FROM ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_IMAGE_VERSION as hyku-base

USER root
Expand All @@ -10,7 +10,6 @@ RUN apk --no-cache upgrade && \
exiftool \
ffmpeg \
git \
imagemagick \
less \
libreoffice \
libreoffice-lang-uk \
Expand All @@ -29,36 +28,42 @@ RUN apk --no-cache upgrade && \
tesseract-ocr \
vim \
yarn \
&& \
# curl https://sh.rustup.rs -sSf | sh -s -- -y && \
# source "$HOME/.cargo/env" && \
# cargo install rbspy && \
echo "******** Packages Installed *********"
build-base \
imagemagick \
imagemagick-dev \
imagemagick-libs \
imagemagick-heic \
imagemagick-jpeg \
imagemagick-jxl \
imagemagick-pdf \
imagemagick-svg \
imagemagick-tiff \
imagemagick-webp \
&& echo "******** Packages Installed *********"

# Build and install ImageMagick
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* \
&& cd ImageMagick-7.1.0-57 \
&& ./configure \
&& make \
&& make install \
&& cd $OLDPWD \
&& rm -rf ImageMagick* \
&& rm -rf /var/cache/apk/*
&& rm -rf ImageMagick-7.1.0-57 \
&& rm -rf 7.1.0-57.tar.gz

# Install "best" training data for Tesseract
RUN echo "📚 Installing Tesseract Best (training data)!" && \
cd /usr/share/tessdata/ && \
wget https://github.com/tesseract-ocr/tessdata_best/blob/main/eng.traineddata?raw=true -O eng_best.traineddata
wget https://github.com/tesseract-ocr/tessdata_best/raw/main/eng.traineddata -O eng_best.traineddata

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 \
&& apk add --virtual vips-dependencies build-base \
&& cd /tmp/vips-${VIPS_VERSION} \
&& ./configure --prefix=/usr \
--disable-static \
Expand Down
Loading