Bumped fcrepo tool dependencies to latest versions.

Islandora-Devops · Dec 20, 2023 · 17d6e1f · 17d6e1f
1 parent 6efb7cd
commit 17d6e1f
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 33 deletions.
diff --git a/fcrepo6/Dockerfile b/fcrepo6/Dockerfile
@@ -2,47 +2,47 @@
 FROM tomcat
 
 ARG TARGETARCH
-ARG FCREPO_VERSION="6.4.1"
-ARG FCREPO_FILE="fcrepo-webapp-${FCREPO_VERSION}.war"
-ARG FCREPO_URL="https://github.com/fcrepo/fcrepo/releases/download/fcrepo-${FCREPO_VERSION}/${FCREPO_FILE}"
-ARG FCREPO_SHA256="df3cb7bbaed1b0408afe0103adce4b65d2e3e0d87fec4c86ece26598763929c2"
+ARG FCREPO_VERSION=6.4.1
+ARG FCREPO_FILE=fcrepo-webapp-${FCREPO_VERSION}.war
+ARG FCREPO_URL=https://github.com/fcrepo/fcrepo/releases/download/fcrepo-${FCREPO_VERSION}/${FCREPO_FILE}
+ARG FCREPO_SHA256=df3cb7bbaed1b0408afe0103adce4b65d2e3e0d87fec4c86ece26598763929c2
 
-ARG SYN_VERSION="1.1.0"
-ARG SYN_FILE="islandora-syn-${SYN_VERSION}-all.jar"
-ARG SYN_URL="https://github.com/Islandora-CLAW/Syn/releases/download/v${SYN_VERSION}/${SYN_FILE}"
-ARG SYN_SHA256="bcad5f872930b1bcc9ea4a176c60e22683297121357336769a21ead9fadcbbd5"
+ARG SYN_VERSION=1.1.1
+ARG SYN_FILE=islandora-syn-${SYN_VERSION}-all.jar
+ARG SYN_URL=https://github.com/Islandora-CLAW/Syn/releases/download/v${SYN_VERSION}/${SYN_FILE}
+ARG SYN_SHA256=24c589d16d579c48361d14c346e0d633a6985642f1c116295ed91eb32b283085
 
-ARG IMPORT_EXPORT_VERSION="1.0.1"
-ARG IMPORT_EXPORT_FILE="fcrepo-import-export-${IMPORT_EXPORT_VERSION}.jar"
-ARG IMPORT_EXPORT_URL="https://github.com/fcrepo-exts/fcrepo-import-export/releases/download/fcrepo-import-export-${IMPORT_EXPORT_VERSION}/${IMPORT_EXPORT_FILE}"
-ARG IMPORT_EXPORT_SHA256="89c579d1223c8f3c0da60c4309a06e47f5919c51929d976e60ea525c60cb33d1"
+ARG IMPORT_EXPORT_VERSION=1.1.0
+ARG IMPORT_EXPORT_FILE=fcrepo-import-export-${IMPORT_EXPORT_VERSION}.jar
+ARG IMPORT_EXPORT_URL=https://github.com/fcrepo-exts/fcrepo-import-export/releases/download/fcrepo-import-export-${IMPORT_EXPORT_VERSION}/${IMPORT_EXPORT_FILE}
+ARG IMPORT_EXPORT_SHA256=fcd26cf1daaba240cc4993f4b60785403b0175fe014e0530b5f32b71f8556833
 
-ARG UPGRADE_UTILS_VERSION="6.0.0-beta-1"
-ARG UPGRADE_UTILS_FILE="fcrepo-upgrade-utils-${UPGRADE_UTILS_VERSION}.jar"
-ARG UPGRADE_UTILS_URL="https://github.com/fcrepo-exts/fcrepo-upgrade-utils/releases/download/fcrepo-upgrade-utils-${UPGRADE_UTILS_VERSION}/${UPGRADE_UTILS_FILE}"
-ARG UPGRADE_UTILS_SHA256="e8a0bbbabca45ff95b2ffb5c62cad49e02548bc116b80f2747d5215f80d02a0a"
+ARG UPGRADE_UTILS_VERSION=6.2.0
+ARG UPGRADE_UTILS_FILE=fcrepo-upgrade-utils-${UPGRADE_UTILS_VERSION}.jar
+ARG UPGRADE_UTILS_URL=https://github.com/fcrepo-exts/fcrepo-upgrade-utils/releases/download/fcrepo-upgrade-utils-${UPGRADE_UTILS_VERSION}/${UPGRADE_UTILS_FILE}
+ARG UPGRADE_UTILS_SHA256=5a975a4ef164193f105d2ccc16656440d8a3bb608fa0d89ae2a5ffb8d7d7593e
 
 # Platform agnostic does not require arch specific identifier.
 RUN --mount=type=cache,id=fcrepo6-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
     download.sh \
-        --url "${FCREPO_URL}" \
-        --sha256 "${FCREPO_SHA256}" \
-        --dest "/opt/tomcat/webapps/fcrepo" \
+        --url ${FCREPO_URL} \
+        --sha256 ${FCREPO_SHA256} \
+        --dest /opt/tomcat/webapps/fcrepo \
     && \
     download.sh \
-        --url "${SYN_URL}" \
-        --sha256 "${SYN_SHA256}" \
-        --dest "/opt/tomcat/lib" \
+        --url ${SYN_URL} \
+        --sha256 ${SYN_SHA256} \
+        --dest /opt/tomcat/lib \
     && \
     download.sh \
-        --url "${IMPORT_EXPORT_URL}" \
-        --sha256 "${IMPORT_EXPORT_SHA256}" \
-        --dest "/opt/tomcat" \
+        --url ${IMPORT_EXPORT_URL} \
+        --sha256 ${IMPORT_EXPORT_SHA256} \
+        --dest /opt/tomcat \
     && \
     download.sh \
-        --url "${UPGRADE_UTILS_URL}" \
-        --sha256 "${UPGRADE_UTILS_SHA256}" \
-        --dest "/opt/tomcat" \
+        --url ${UPGRADE_UTILS_URL} \
+        --sha256 ${UPGRADE_UTILS_SHA256} \
+        --dest /opt/tomcat \
     && \
     cleanup.sh
 

diff --git a/fcrepo6/README.md b/fcrepo6/README.md
@@ -1,10 +1,10 @@
 # Fcrepo
 
-Docker image for [Fcrepo] version 6.4.1.
+Docker image for [fcrepo] version 6.4.1.
 
 Please refer to the [Fcrepo Documentation] for more in-depth information.
 
-As a quick example this will bring up an instance of [Fcrepo], and allow you
+As a quick example this will bring up an instance of [fcrepo], and allow you
 to view on <http://localhost:80/fcrepo/>.
 
 ```bash
@@ -55,12 +55,12 @@ is the url and the 'name' is a key that replaces the '*' symbol below.
 
 ### JWT Settings
 
-[Fcrepo] makes use of JWT for authentication. Please see the documentation in
+[fcrepo] makes use of JWT for authentication. Please see the documentation in
 the [base image] for more information.
 
 ### Database Settings
 
-[Fcrepo] can optionally make use of a database for object storage. Please see
+[fcrepo] can optionally make use of a database for object storage. Please see
 the documentation in the [base image] for more information about the default
 database connection configuration.
 
@@ -81,9 +81,85 @@ Additionally the `DB_DRIVER` variable is derived from the
 Fcrepo is deployed in as a servlet in Tomcat. Please see the documentation in
 the [tomcat image] for more information.
 
+
+## Updating
+
+You can change the version used for [fcrepo] by modifying the build argument
+`FCREPO_VERSION` and `FCREPO_SHA256` in the `Dockerfile`.
+
+Change `FCREPO_VERSION` and then generate the `FCREPO_SHA256` with the following
+commands:
+
+```bash
+FCREPO_VERSION=$(cat fcrepo6/Dockerfile | grep -o 'FCREPO_VERSION=.*' | cut -f2 -d=)
+FCREPO_FILE=$(cat fcrepo6/Dockerfile | grep -o 'FCREPO_FILE=.*' | cut -f2 -d=)
+FCREPO_URL=$(cat fcrepo6/Dockerfile | grep -o 'FCREPO_URL=.*' | cut -f2 -d=)
+FCREPO_FILE=$(eval "echo $FCREPO_FILE")
+FCREPO_URL=$(eval "echo $FCREPO_URL")
+wget --quiet "${FCREPO_URL}"
+shasum -a 256 "${FCREPO_FILE}" | cut -f1 -d' '
+rm "${FCREPO_FILE}"
+```
+
+You can change the version used for [syn] by modifying the build argument
+`SYN_VERSION` and `SYN_SHA256` in the `Dockerfile`.
+
+Change `SYN_VERSION` and then generate the `SYN_SHA256` with the following
+commands:
+
+```bash
+SYN_VERSION=$(cat fcrepo6/Dockerfile | grep -o 'SYN_VERSION=.*' | cut -f2 -d=)
+SYN_FILE=$(cat fcrepo6/Dockerfile | grep -o 'SYN_FILE=.*' | cut -f2 -d=)
+SYN_URL=$(cat fcrepo6/Dockerfile | grep -o 'SYN_URL=.*' | cut -f2 -d=)
+SYN_FILE=$(eval "echo $SYN_FILE")
+SYN_URL=$(eval "echo $SYN_URL")
+wget --quiet "${SYN_URL}"
+shasum -a 256 "${SYN_FILE}" | cut -f1 -d' '
+rm "${SYN_FILE}"
+```
+
+You can change the version used for [fcrepo-import-export] by modifying the
+build argument `IMPORT_EXPORT_VERSION` and `IMPORT_EXPORT_SHA256` in the
+`Dockerfile`.
+
+Change `IMPORT_EXPORT_VERSION` and then generate the `IMPORT_EXPORT_SHA256` with
+the following commands:
+
+```bash
+IMPORT_EXPORT_VERSION=$(cat fcrepo6/Dockerfile | grep -o 'IMPORT_EXPORT_VERSION=.*' | cut -f2 -d=)
+IMPORT_EXPORT_FILE=$(cat fcrepo6/Dockerfile | grep -o 'IMPORT_EXPORT_FILE=.*' | cut -f2 -d=)
+IMPORT_EXPORT_URL=$(cat fcrepo6/Dockerfile | grep -o 'IMPORT_EXPORT_URL=.*' | cut -f2 -d=)
+IMPORT_EXPORT_FILE=$(eval "echo $IMPORT_EXPORT_FILE")
+IMPORT_EXPORT_URL=$(eval "echo $IMPORT_EXPORT_URL")
+wget --quiet "${IMPORT_EXPORT_URL}"
+shasum -a 256 "${IMPORT_EXPORT_FILE}" | cut -f1 -d' '
+rm "${IMPORT_EXPORT_FILE}"
+```
+
+You can change the version used for [fcrepo-upgrade-utils] by modifying the
+build argument `UPGRADE_UTILS_VERSION` and `UPGRADE_UTILS_SHA256` in the
+`Dockerfile`.
+
+Change `UPGRADE_UTILS_VERSION` and then generate the `UPGRADE_UTILS_SHA256` with
+the following commands:
+
+```bash
+UPGRADE_UTILS_VERSION=$(cat fcrepo6/Dockerfile | grep -o 'UPGRADE_UTILS_VERSION=.*' | cut -f2 -d=)
+UPGRADE_UTILS_FILE=$(cat fcrepo6/Dockerfile | grep -o 'UPGRADE_UTILS_FILE=.*' | cut -f2 -d=)
+UPGRADE_UTILS_URL=$(cat fcrepo6/Dockerfile | grep -o 'UPGRADE_UTILS_URL=.*' | cut -f2 -d=)
+UPGRADE_UTILS_FILE=$(eval "echo $UPGRADE_UTILS_FILE")
+UPGRADE_UTILS_URL=$(eval "echo $UPGRADE_UTILS_URL")
+wget --quiet "${UPGRADE_UTILS_URL}"
+shasum -a 256 "${UPGRADE_UTILS_FILE}" | cut -f1 -d' '
+rm "${UPGRADE_UTILS_FILE}"
+```
+
 [base image]: ../base/README.md
 [external content]: https://wiki.lyrasis.org/display/FEDORA6x/External+Content
 [Fcrepo Documentation]: https://wiki.lyrasis.org/display/FF
-[Fcrepo]: https://github.com/fcrepo/fcrepo
+[fcrepo-import-export]: https://github.com/fcrepo-exts/fcrepo-import-export
+[fcrepo-upgrade-utils]: https://github.com/fcrepo-exts/fcrepo-upgrade-utils
+[fcrepo]: https://github.com/fcrepo/fcrepo
 [s3]: https://aws.amazon.com/s3/
+[syn]: https://github.com/Islandora-CLAW/Syn
 [tomcat image]: ../tomcat/README.md