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.

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

[IIIF-1195] Update versions in README #117

Merged
merged 2 commits into from
Aug 3, 2021
Merged

[IIIF-1195] Update versions in README #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c03d977
[IIIF-1195] Update versions in README
ksclarke Aug 3, 2021
c1eb87f
Bump docker image's version of curl
ksclarke Aug 3, 2021
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ 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

_We use `verify` instead of `package` because there are tests in the verify stage that will be run against the newly build container to make sure it's built and configured like it should be._

_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

Expand Down Expand Up @@ -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:

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

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<libturbojpeg.version>2.0.3-0ubuntu1.20.04.1</libturbojpeg.version>
<unzip.version>6.0-25ubuntu1</unzip.version>
<zip.version>3.0-11build1</zip.version>
<curl.version>7.68.0-1ubuntu2.5</curl.version>
<curl.version>7.68.0-1ubuntu2.6</curl.version>
<ffmpeg.version>7:4.2.4-1ubuntu0.1</ffmpeg.version>
<python2.version>2.7.17-2ubuntu4</python2.version>
<grok.version>9.1.0</grok.version>
Expand Down