@@ -24,10 +24,11 @@ RUN mkdir -p /opt/fits && \
2424 cd /opt/fits && unzip fits-1.5.5.zip && rm fits-1.5.5.zip && chmod +X fits.sh && \
2525 sed -i 's/\( <tool.*TikaTool.*>\) /<!--\1 -->/ ; s/\( <tool.*FFIdent.*>\) /<!--\1 -->/' /opt/fits/xml/fits.xml && \
2626 sed -i "s/exiftool\/ ImageWidth\[ last()\] /substring-before(exiftool\/ ImageSize, 'x')/ ; s/exiftool\/ ImageHeight\[ last()\] /substring-after(exiftool\/ ImageSize, 'x')/" /opt/fits/xml/exiftool/exiftool_image_to_fits.xslt
27- ENV PATH /opt/fits:$PATH
28- ENV RUBY_THREAD_MACHINE_STACK_SIZE 16777216
29- ENV RUBY_THREAD_VM_STACK_SIZE 16777216
30- ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so.2
27+ ENV PATH=/opt/fits:$PATH \
28+ RUBY_THREAD_MACHINE_STACK_SIZE=16777216 \
29+ RUBY_THREAD_VM_STACK_SIZE=16777216 \
30+ LD_PRELOAD=/usr/local/lib/libjemalloc.so.2 \
31+ NODE_OPTIONS=--openssl-legacy-provider
3132
3233# Installs specific version of ImageMagick to work with iiif_print
3334RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-57.tar.gz && \
@@ -57,7 +58,7 @@ COPY --chown=essi:essi . .
5758
5859RUN mkdir /app/tmp/cache
5960
60- ENV RAILS_LOG_TO_STDOUT true
61+ ENV RAILS_LOG_TO_STDOUT= true
6162
6263# ##
6364# ruby dependencies image
@@ -81,26 +82,26 @@ RUN gem install bundler -v "~> 2.4.22" && \
8182
8283COPY --chown=essi:essi . .
8384
84- ENV RAILS_LOG_TO_STDOUT true
85- ENV RAILS_ENV production
86- ENV SKIP_IIIF_PRINT_BULKRAX_VERSION_REQUIREMENT true
85+ ENV RAILS_LOG_TO_STDOUT= true \
86+ RAILS_ENV= production \
87+ SKIP_IIIF_PRINT_BULKRAX_VERSION_REQUIREMENT= true
8788
8889ENTRYPOINT ["bundle" , "exec" ]
8990
9091# ##
9192# sidekiq image
92- FROM essi-deps as essi-sidekiq
93+ FROM essi-deps AS essi-sidekiq
9394USER essi:essi
9495ARG SOURCE_COMMIT
95- ENV SOURCE_COMMIT $SOURCE_COMMIT
96- CMD sidekiq
96+ ENV SOURCE_COMMIT= $SOURCE_COMMIT
97+ CMD [ " sidekiq" ]
9798
9899# ##
99100# webserver image
100- FROM essi-deps as essi-web
101+ FROM essi-deps AS essi-web
101102USER essi:essi
102103RUN bundle exec rake assets:precompile
103104EXPOSE 3000
104105ARG SOURCE_COMMIT
105- ENV SOURCE_COMMIT $SOURCE_COMMIT
106- CMD puma -b tcp://0.0.0.0:3000
106+ ENV SOURCE_COMMIT= $SOURCE_COMMIT
107+ CMD [ " puma" , "-b" , " tcp://0.0.0.0:3000" ]
0 commit comments