From c03d977eab93b83023ad453f1beb399bd1412a50 Mon Sep 17 00:00:00 2001 From: "Kevin S. Clarke" Date: Tue, 3 Aug 2021 15:07:28 -0400 Subject: [PATCH 1/2] [IIIF-1195] Update versions in README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1fe146a..8bc34ea 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Historical note: We used to build this project using Ruby, but to simplify our p ### Create the Docker image -To build the current stable version of Cantaloupe (i.e., 4.1.x), run: +To build the current stable version of Cantaloupe (i.e., 5.x), run: mvn verify @@ -15,7 +15,7 @@ _We use `verify` instead of `package` because there are tests in the verify stag _Hint: If the build fails, it may be because a package in the Docker image has been recently updated. To work around this, see the [Working with Pinned OS Packages](https://github.com/uclalibrary/docker-cantaloupe#working-with-pinned-os-packages) section at the bottom of this document._ -To build the latest development version of Cantaloupe (i.e., 5.0-SNAPSHOT), use the following: +To build the latest nightly build of Cantaloupe, use the following: mvn verify -DdevBuild @@ -56,7 +56,7 @@ In addition to running a test Cantaloupe server using the Maven Docker plugin, y docker run -d -p 8182:8182 \ -e "CANTALOUPE_ENDPOINT_ADMIN_SECRET=secret" \ -e "CANTALOUPE_ENDPOINT_ADMIN_ENABLED=true" \ - --name melon -v /path/to/your/images:/imageroot cantaloupe:5.0.2-0 # or latest version + --name melon -v /path/to/your/images:/imageroot cantaloupe:5.0.3-0 # or latest version Here is another, more complex, example: @@ -71,7 +71,7 @@ Here is another, more complex, example: -e "CANTALOUPE_S3SOURCE_ENDPOINT=s3.amazonaws.com" \ -e "CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_ENABLED=true" \ -e "CANTALOUPE_LOG_APPLICATION_FILEAPPENDER_PATHNAME=/var/log/cantaloupe/cantaloupe.log" \ - --name melon -v /path/to/your/images:/imageroot cantaloupe:5.0.2-0 # or latest version + --name melon -v /path/to/your/images:/imageroot cantaloupe:5.0.3-0 # or latest version There are, of course, other ways to run Docker without having to supply all these environmental variables on the command line. One might want to use a Docker Compose file, Terraform configs, or Kubernetes. From c1eb87f3df13cfcf4c1cfb4758326217deae0ce6 Mon Sep 17 00:00:00 2001 From: "Kevin S. Clarke" Date: Tue, 3 Aug 2021 15:15:48 -0400 Subject: [PATCH 2/2] Bump docker image's version of curl --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9498951..5453936 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 2.0.3-0ubuntu1.20.04.1 6.0-25ubuntu1 3.0-11build1 - 7.68.0-1ubuntu2.5 + 7.68.0-1ubuntu2.6 7:4.2.4-1ubuntu0.1 2.7.17-2ubuntu4 9.1.0