Skip to content
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.

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

Bumped fcrepo tool dependencies to latest versions. #305

Merged
merged 1 commit into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions fcrepo6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ ARG UPGRADE_UTILS_SHA256=a897faeda52322ead9b619dfadab6f77d3f4b3c5baf8ab3f188e8d8
# 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

Expand Down
86 changes: 81 additions & 5 deletions fcrepo6/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.

Expand All @@ -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
Loading