Skip to content

Commit 9841a49

Browse files
joecoralljoecorall
authored
[major] replace crayfish derivative microservices with scyllaridae (#432)
* [major] replace derivative microservices with scyllaridae * build scyllaridae * Use scyllaridae URIs for microservices * Single LOG_LEVEL for microservices * remove stale nginx ownership * rm crayfish dockerfile command * update READMEs * f * Update scyllaridae.yml for crayfish apps * Add renovate support * Add an integration test for homarus * Add other three integration tests * Just pull in main as the default We aren't testing FITS functionality in this test per-say so using the latest version should be fine * Wait for FITS * just rm crayfits for now the test runs fine locally. It's probably our simplest scyllaridae microservice so we probably don't need to test this * put this bacl
1 parent a0adc21 commit 9841a49

67 files changed

Lines changed: 579 additions & 34028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/push.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
repository: ${{ vars.repository }}
8484
tags: ${{ needs.tags.outputs.tags }}
8585
secrets: inherit
86-
needs: [tags, nginx]
86+
needs: [tags, scyllaridae]
8787
drupal:
8888
uses: ./.github/workflows/build.yml
8989
with:
@@ -128,7 +128,7 @@ jobs:
128128
repository: ${{ vars.repository }}
129129
tags: ${{ needs.tags.outputs.tags }}
130130
secrets: inherit
131-
needs: [tags, crayfish]
131+
needs: [tags, scyllaridae]
132132
houdini:
133133
uses: ./.github/workflows/build.yml
134134
with:
@@ -137,7 +137,7 @@ jobs:
137137
repository: ${{ vars.repository }}
138138
tags: ${{ needs.tags.outputs.tags }}
139139
secrets: inherit
140-
needs: [tags, crayfish, imagemagick]
140+
needs: [tags, scyllaridae, imagemagick]
141141
hypercube:
142142
uses: ./.github/workflows/build.yml
143143
with:
@@ -146,7 +146,7 @@ jobs:
146146
repository: ${{ vars.repository }}
147147
tags: ${{ needs.tags.outputs.tags }}
148148
secrets: inherit
149-
needs: [tags, crayfish, leptonica]
149+
needs: [tags, scyllaridae, leptonica]
150150
imagemagick:
151151
uses: ./.github/workflows/build.yml
152152
with:
@@ -219,6 +219,15 @@ jobs:
219219
tags: ${{ needs.tags.outputs.tags }}
220220
secrets: inherit
221221
needs: [tags, nginx]
222+
scyllaridae:
223+
uses: ./.github/workflows/build.yml
224+
with:
225+
contexts: ${{ needs.base.outputs.context }}
226+
image: scyllaridae
227+
repository: ${{ vars.repository }}
228+
tags: ${{ needs.tags.outputs.tags }}
229+
secrets: inherit
230+
needs: [tags, base]
222231
solr:
223232
uses: ./.github/workflows/build.yml
224233
with:

‎alpaca/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,25 @@ ENV \
3131
ALPACA_DERIVATIVE_FITS_ENABLED=true \
3232
ALPACA_DERIVATIVE_FITS_MAX_CONSUMERS=-1 \
3333
ALPACA_DERIVATIVE_FITS_QUEUE=queue:islandora-connector-fits \
34-
ALPACA_DERIVATIVE_FITS_URL=http://crayfits:8000/ \
34+
ALPACA_DERIVATIVE_FITS_URL=http://crayfits:8080/ \
3535
ALPACA_DERIVATIVE_HOMARUS_ASYNC_CONSUMER=true \
3636
ALPACA_DERIVATIVE_HOMARUS_CONSUMERS=-1 \
3737
ALPACA_DERIVATIVE_HOMARUS_ENABLED=true \
3838
ALPACA_DERIVATIVE_HOMARUS_MAX_CONSUMERS=-1 \
3939
ALPACA_DERIVATIVE_HOMARUS_QUEUE=queue:islandora-connector-homarus \
40-
ALPACA_DERIVATIVE_HOMARUS_URL=http://homarus:8000/convert \
40+
ALPACA_DERIVATIVE_HOMARUS_URL=http://homarus:8080/ \
4141
ALPACA_DERIVATIVE_HOUDINI_ASYNC_CONSUMER=true \
4242
ALPACA_DERIVATIVE_HOUDINI_CONSUMERS=-1 \
4343
ALPACA_DERIVATIVE_HOUDINI_ENABLED=true \
4444
ALPACA_DERIVATIVE_HOUDINI_MAX_CONSUMERS=-1 \
4545
ALPACA_DERIVATIVE_HOUDINI_QUEUE=queue:islandora-connector-houdini \
46-
ALPACA_DERIVATIVE_HOUDINI_URL=http://houdini:8000/convert \
46+
ALPACA_DERIVATIVE_HOUDINI_URL=http://houdini:8080/ \
4747
ALPACA_DERIVATIVE_OCR_ASYNC_CONSUMER=true \
4848
ALPACA_DERIVATIVE_OCR_CONSUMERS=-1 \
4949
ALPACA_DERIVATIVE_OCR_ENABLED=true \
5050
ALPACA_DERIVATIVE_OCR_MAX_CONSUMERS=-1 \
5151
ALPACA_DERIVATIVE_OCR_QUEUE=queue:islandora-connector-ocr \
52-
ALPACA_DERIVATIVE_OCR_URL=http://hypercube:8000/ \
52+
ALPACA_DERIVATIVE_OCR_URL=http://hypercube:8080/ \
5353
ALPACA_DERIVATIVE_SYSTEMS=fits,homarus,houdini,ocr,transkribus \
5454
ALPACA_DERIVATIVE_TRANSKRIBUS_ASYNC_CONSUMER=true \
5555
ALPACA_DERIVATIVE_TRANSKRIBUS_CONSUMERS=-1 \

‎alpaca/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ additional settings, volumes, ports, etc.
2626
| ALPACA_DERIVATIVE_FITS_ENABLED | true | |
2727
| ALPACA_DERIVATIVE_FITS_MAX_CONSUMERS | -1 | |
2828
| ALPACA_DERIVATIVE_FITS_QUEUE | queue:islandora-connector-fits | ActiveMQ Queue to consume from |
29-
| ALPACA_DERIVATIVE_FITS_URL | http://crayfits:8000 | Url of micro-service |
29+
| ALPACA_DERIVATIVE_FITS_URL | http://crayfits:8080/ | Url of micro-service |
3030
| ALPACA_DERIVATIVE_HOMARUS_ASYNC_CONSUMER | true | |
3131
| ALPACA_DERIVATIVE_HOMARUS_CONSUMERS | -1 | |
3232
| ALPACA_DERIVATIVE_HOMARUS_ENABLED | true | |
3333
| ALPACA_DERIVATIVE_HOMARUS_MAX_CONSUMERS | -1 | |
3434
| ALPACA_DERIVATIVE_HOMARUS_QUEUE | queue:islandora-connector-homarus | ActiveMQ Queue to consume from |
35-
| ALPACA_DERIVATIVE_HOMARUS_URL | http://homarus:8000/convert | Url of micro-service |
35+
| ALPACA_DERIVATIVE_HOMARUS_URL | http://homarus:8080/ | Url of micro-service |
3636
| ALPACA_DERIVATIVE_HOUDINI_ASYNC_CONSUMER | true | |
3737
| ALPACA_DERIVATIVE_HOUDINI_CONSUMERS | -1 | |
3838
| ALPACA_DERIVATIVE_HOUDINI_ENABLED | true | |
3939
| ALPACA_DERIVATIVE_HOUDINI_MAX_CONSUMERS | -1 | |
4040
| ALPACA_DERIVATIVE_HOUDINI_QUEUE | queue:islandora-connector-houdini | ActiveMQ Queue to consume from |
41-
| ALPACA_DERIVATIVE_HOUDINI_URL | http://houdini:8000/convert | Url of micro-service |
41+
| ALPACA_DERIVATIVE_HOUDINI_URL | http://houdini:8080/ | Url of micro-service |
4242
| ALPACA_DERIVATIVE_OCR_ASYNC_CONSUMER | true | |
4343
| ALPACA_DERIVATIVE_OCR_CONSUMERS | -1 | |
4444
| ALPACA_DERIVATIVE_OCR_ENABLED | true | |
4545
| ALPACA_DERIVATIVE_OCR_MAX_CONSUMERS | -1 | |
4646
| ALPACA_DERIVATIVE_OCR_QUEUE | queue:islandora-connector-ocr | ActiveMQ Queue to consume from |
47-
| ALPACA_DERIVATIVE_OCR_URL | http://hypercube:8000 | Url of micro-service |
47+
| ALPACA_DERIVATIVE_OCR_URL | http://hypercube:8080/ | Url of micro-service |
4848
| ALPACA_DERIVATIVE_SYSTEMS | fits,homarus,houdini,ocr | |
4949
| ALPACA_FCREPO_INDEXER_ASYNC_CONSUMER | true | |
5050
| ALPACA_FCREPO_INDEXER_CONSUMERS | -1 | |

‎ci/update-sha.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,19 @@ elif [ "$DEP" = "s6-overlay" ]; then
170170
done
171171

172172
exit 0
173+
elif [ "$DEP" = "scyllaridae"] ; then
174+
BASE_URL="https://github.com/islandora/scyllaridae/releases/download/${NEW_VERSION}"
175+
declare -A URLS_AND_ARGS=(
176+
["SCYLLARIDAE_AMD64_SHA256"]="$BASE_URL/scyllaridae_Linux_x86_64.tar.gz"
177+
["SCYLLARIDAE_ARM64_SHA256"]="$BASE_URL/scyllaridae_Linux_arm64.tar.gz""
178+
)
179+
180+
for ARG in "${!URLS_AND_ARGS[@]}"; do
181+
URL="${URLS_AND_ARGS[$ARG]}"
182+
update_dockerfile_sha "$URL" "$ARG" "scyllaridae/Dockerfile"
183+
done
184+
update_readme "$README" "$OLD_VERSION" "$NEW_VERSION"
185+
173186
else
174187
echo "DEP not found"
175188
exit 0

0 commit comments

Comments
 (0)