Skip to content

[major] replace crayfish derivative microservices with scyllaridae #432

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

Merged
nigelgbanks merged 20 commits into from
Oct 11, 2025
Merged

[major] replace crayfish derivative microservices with scyllaridae #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
97b46db
[major] replace derivative microservices with scyllaridae
joecorall May 16, 2025
502d37c
build scyllaridae
joecorall May 16, 2025
b3816da
Use scyllaridae URIs for microservices
joecorall May 16, 2025
e2cfd2b
Single LOG_LEVEL for microservices
joecorall May 16, 2025
fc46134
remove stale nginx ownership
joecorall May 16, 2025
4e21db5
rm crayfish dockerfile command
joecorall May 16, 2025
53141e4
update READMEs
joecorall Jul 15, 2025
c2a2ec9
Merge branch 'main' into scyllaridae
joecorall Jul 15, 2025
029942a
f
joecorall Jul 15, 2025
fba4aeb
merge
joecorall Jul 15, 2025
b038dce
Merge branch 'main' into scyllaridae
joecorall Sep 26, 2025
8cd25e3
Update scyllaridae.yml for crayfish apps
joecorall Oct 8, 2025
642c054
Merge branch 'main' into scyllaridae
joecorall Oct 8, 2025
7dce91c
Add renovate support
joecorall Oct 8, 2025
234b758
Add an integration test for homarus
joecorall Oct 10, 2025
6e18c8a
Add other three integration tests
joecorall Oct 10, 2025
729c865
Just pull in main as the default
joecorall Oct 10, 2025
c474823
Wait for FITS
joecorall Oct 10, 2025
63a313e
just rm crayfits for now
joecorall Oct 10, 2025
7c03a82
put this bacl
joecorall Oct 10, 2025
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
17 changes: 13 additions & 4 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
repository: ${{ vars.repository }}
tags: ${{ needs.tags.outputs.tags }}
secrets: inherit
needs: [tags, nginx]
needs: [tags, scyllaridae]
drupal:
uses: ./.github/workflows/build.yml
with:
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
repository: ${{ vars.repository }}
tags: ${{ needs.tags.outputs.tags }}
secrets: inherit
needs: [tags, crayfish]
needs: [tags, scyllaridae]
houdini:
uses: ./.github/workflows/build.yml
with:
Expand All @@ -137,7 +137,7 @@ jobs:
repository: ${{ vars.repository }}
tags: ${{ needs.tags.outputs.tags }}
secrets: inherit
needs: [tags, crayfish, imagemagick]
needs: [tags, scyllaridae, imagemagick]
hypercube:
uses: ./.github/workflows/build.yml
with:
Expand All @@ -146,7 +146,7 @@ jobs:
repository: ${{ vars.repository }}
tags: ${{ needs.tags.outputs.tags }}
secrets: inherit
needs: [tags, crayfish, leptonica]
needs: [tags, scyllaridae, leptonica]
imagemagick:
uses: ./.github/workflows/build.yml
with:
Expand Down Expand Up @@ -219,6 +219,15 @@ jobs:
tags: ${{ needs.tags.outputs.tags }}
secrets: inherit
needs: [tags, nginx]
scyllaridae:
uses: ./.github/workflows/build.yml
with:
contexts: ${{ needs.base.outputs.context }}
image: scyllaridae
repository: ${{ vars.repository }}
tags: ${{ needs.tags.outputs.tags }}
secrets: inherit
needs: [tags, base]
solr:
uses: ./.github/workflows/build.yml
with:
Expand Down
8 changes: 4 additions & 4 deletions alpaca/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@ ENV \
ALPACA_DERIVATIVE_FITS_ENABLED=true \
ALPACA_DERIVATIVE_FITS_MAX_CONSUMERS=-1 \
ALPACA_DERIVATIVE_FITS_QUEUE=queue:islandora-connector-fits \
ALPACA_DERIVATIVE_FITS_URL=http://crayfits:8000/ \
ALPACA_DERIVATIVE_FITS_URL=http://crayfits:8080/ \
ALPACA_DERIVATIVE_HOMARUS_ASYNC_CONSUMER=true \
ALPACA_DERIVATIVE_HOMARUS_CONSUMERS=-1 \
ALPACA_DERIVATIVE_HOMARUS_ENABLED=true \
ALPACA_DERIVATIVE_HOMARUS_MAX_CONSUMERS=-1 \
ALPACA_DERIVATIVE_HOMARUS_QUEUE=queue:islandora-connector-homarus \
ALPACA_DERIVATIVE_HOMARUS_URL=http://homarus:8000/convert \
ALPACA_DERIVATIVE_HOMARUS_URL=http://homarus:8080/ \
ALPACA_DERIVATIVE_HOUDINI_ASYNC_CONSUMER=true \
ALPACA_DERIVATIVE_HOUDINI_CONSUMERS=-1 \
ALPACA_DERIVATIVE_HOUDINI_ENABLED=true \
ALPACA_DERIVATIVE_HOUDINI_MAX_CONSUMERS=-1 \
ALPACA_DERIVATIVE_HOUDINI_QUEUE=queue:islandora-connector-houdini \
ALPACA_DERIVATIVE_HOUDINI_URL=http://houdini:8000/convert \
ALPACA_DERIVATIVE_HOUDINI_URL=http://houdini:8080/ \
ALPACA_DERIVATIVE_OCR_ASYNC_CONSUMER=true \
ALPACA_DERIVATIVE_OCR_CONSUMERS=-1 \
ALPACA_DERIVATIVE_OCR_ENABLED=true \
ALPACA_DERIVATIVE_OCR_MAX_CONSUMERS=-1 \
ALPACA_DERIVATIVE_OCR_QUEUE=queue:islandora-connector-ocr \
ALPACA_DERIVATIVE_OCR_URL=http://hypercube:8000/ \
ALPACA_DERIVATIVE_OCR_URL=http://hypercube:8080/ \
ALPACA_DERIVATIVE_SYSTEMS=fits,homarus,houdini,ocr,transkribus \
ALPACA_DERIVATIVE_TRANSKRIBUS_ASYNC_CONSUMER=true \
ALPACA_DERIVATIVE_TRANSKRIBUS_CONSUMERS=-1 \
Expand Down
8 changes: 4 additions & 4 deletions alpaca/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@ additional settings, volumes, ports, etc.
| ALPACA_DERIVATIVE_FITS_ENABLED | true | |
| ALPACA_DERIVATIVE_FITS_MAX_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_FITS_QUEUE | queue:islandora-connector-fits | ActiveMQ Queue to consume from |
| ALPACA_DERIVATIVE_FITS_URL | http://crayfits:8000 | Url of micro-service |
| ALPACA_DERIVATIVE_FITS_URL | http://crayfits:8080/ | Url of micro-service |
| ALPACA_DERIVATIVE_HOMARUS_ASYNC_CONSUMER | true | |
| ALPACA_DERIVATIVE_HOMARUS_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_HOMARUS_ENABLED | true | |
| ALPACA_DERIVATIVE_HOMARUS_MAX_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_HOMARUS_QUEUE | queue:islandora-connector-homarus | ActiveMQ Queue to consume from |
| ALPACA_DERIVATIVE_HOMARUS_URL | http://homarus:8000/convert | Url of micro-service |
| ALPACA_DERIVATIVE_HOMARUS_URL | http://homarus:8080/ | Url of micro-service |
| ALPACA_DERIVATIVE_HOUDINI_ASYNC_CONSUMER | true | |
| ALPACA_DERIVATIVE_HOUDINI_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_HOUDINI_ENABLED | true | |
| ALPACA_DERIVATIVE_HOUDINI_MAX_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_HOUDINI_QUEUE | queue:islandora-connector-houdini | ActiveMQ Queue to consume from |
| ALPACA_DERIVATIVE_HOUDINI_URL | http://houdini:8000/convert | Url of micro-service |
| ALPACA_DERIVATIVE_HOUDINI_URL | http://houdini:8080/ | Url of micro-service |
| ALPACA_DERIVATIVE_OCR_ASYNC_CONSUMER | true | |
| ALPACA_DERIVATIVE_OCR_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_OCR_ENABLED | true | |
| ALPACA_DERIVATIVE_OCR_MAX_CONSUMERS | -1 | |
| ALPACA_DERIVATIVE_OCR_QUEUE | queue:islandora-connector-ocr | ActiveMQ Queue to consume from |
| ALPACA_DERIVATIVE_OCR_URL | http://hypercube:8000 | Url of micro-service |
| ALPACA_DERIVATIVE_OCR_URL | http://hypercube:8080/ | Url of micro-service |
| ALPACA_DERIVATIVE_SYSTEMS | fits,homarus,houdini,ocr | |
| ALPACA_FCREPO_INDEXER_ASYNC_CONSUMER | true | |
| ALPACA_FCREPO_INDEXER_CONSUMERS | -1 | |
Expand Down
13 changes: 13 additions & 0 deletions ci/update-sha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,19 @@ elif [ "$DEP" = "s6-overlay" ]; then
done

exit 0
elif [ "$DEP" = "scyllaridae"] ; then
BASE_URL="https://github.com/islandora/scyllaridae/releases/download/${NEW_VERSION}"
declare -A URLS_AND_ARGS=(
["SCYLLARIDAE_AMD64_SHA256"]="$BASE_URL/scyllaridae_Linux_x86_64.tar.gz"
["SCYLLARIDAE_ARM64_SHA256"]="$BASE_URL/scyllaridae_Linux_arm64.tar.gz""
)

for ARG in "${!URLS_AND_ARGS[@]}"; do
URL="${URLS_AND_ARGS[$ARG]}"
update_dockerfile_sha "$URL" "$ARG" "scyllaridae/Dockerfile"
done
update_readme "$README" "$OLD_VERSION" "$NEW_VERSION"

else
echo "DEP not found"
exit 0
Expand Down
Loading
Loading