AP-589: rebuild image based on upstream iipsrv/iipsrv image#7
Open
anarchivist wants to merge 2 commits intomainfrom
Open
AP-589: rebuild image based on upstream iipsrv/iipsrv image#7anarchivist wants to merge 2 commits intomainfrom
anarchivist wants to merge 2 commits intomainfrom
Conversation
anarchivist
force-pushed
the
AP-589
branch
11 times, most recently
from
14c9be7 to
048375c
Compare
Ruven, the IIPImage maintainer, updates the iipsrv images upon new releases of iipsrv. This PR uses his (Alpine/lighttpd-based) image as a base image and update the package dependencies as part of the build process. This upgrades us from IIPImage 1.1 to 1.3. One of the major changes in 1.2 is that iipsrv now supports the version 3.0 of the IIIF Image API, which necessitates some changes in the fixtures we're using. Otherwise, IIPImage 1.3 should be a drop-in replacement for the v1.1 image we have been using for UCBEARS.
|
|
||
| ENV LOGFILE=/dev/stdout | ||
| # iipsrv/iipsrv sets this by default; we don't want to do that | ||
| ENV FILESYSTEM_PREFIX= |
Member
There was a problem hiding this comment.
Why override this in the Dockerfile (furthering our diff with the base image) rather than in the Compose files of stacks that use this image?
Member
Author
There was a problem hiding this comment.
we're overriding it anyway. i think this was a compromise with how the test script worked; i could take a different approach there instead.
iipsrv-entrypoint.sh
Outdated
| echo 'Starting iipsrv.fcgi' | ||
| echo | ||
| spawn-fcgi -n -f /iipsrv/iipsrv.fcgi -p 9000 | ||
| echo 'Delegating to iipsrv entrypoint' |
Member
There was a problem hiding this comment.
I don't really understand why this entrypoint exists. All of the preceding logic around FILESYSTEM_PREFIX/DEFAULT_FILESYSTEM_PREFIX could be handled by setting those values in the compose.ci.yml file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ruven, the IIPImage maintainer, updates the iipsrv images upon new releases of iipsrv. This PR uses his (Alpine/lighttpd-based) image as a base image and update the package dependencies as part of the build process.
This upgrades us from IIPImage 1.1 to 1.3. One of the major changes in 1.2 is that iipsrv now supports the version 3.0 of the IIIF Image API, which necessitates some changes in the fixtures we're using. Otherwise, IIPImage 1.3 should be a drop-in replacement for the v1.1 image we have been using for UCBEARS.