Merge pull request #61 from uoregon-libraries/release/4.2.0

Release/4.2.0

Author: jechols

.gitignore

@@ -3,3 +3,4 @@
 !/docker/images/testfile/test-world*
 /.env
 /docker-compose.override.yml
+/compose.override.yml

docker-compose.build.yml compose.build.ymldocker-compose.build.yml renamed to compose.build.yml

@@ -1,8 +1,6 @@
 # This file is used to run builds on systems where installing the RAIS
 # dependencies is too cumbersome or simply undesirable.  This is most easily
 # used via the `scripts/buildrun.sh` command.
-version: "3.4"
-
 volumes:
   gopkg: {}
   gocache: {}

docker-compose.override-example.yml compose.override-example.ymldocker-compose.override-example.yml renamed to compose.override-example.yml

@@ -1,9 +1,8 @@
-# Copy this to docker-compose.override.yml and modify as needed.  This file
+# Copy this to compose.override.yml and modify as needed. This file
 # adds some dev-friendly container magic to the mix:
 #
 # - All binaries are mounted into the container so you can test out local changes
 # - RAIS directly exposes its port to the host machine for quick debugging
-version: "3.4"
 services:
   rais:
     # Uncomment one of these if you'd like to use an image built by `make

docker-compose.yml compose.ymldocker-compose.yml renamed to compose.yml

@@ -1,13 +1,11 @@
 # This describes a self-contained demo of RAIS, using nginx to serve up the
 # static pages.  This isn't a production configuration file!!
 #
-# If you don't set up an override file (docker-compose.override-example.yml,
+# If you don't set up an override file (compose.override-example.yml,
 # for instance), this will just use the stable version of RAIS from dockerhub.
 #
 # Put JP2s into docker/images and the apache entrypoint script will add them to
 # the images served by from RAIS.
-version: "3.4"
-
 services:
   rais:
     image: uolibraries/rais

docker/Dockerfile

@@ -51,8 +51,8 @@ RUN groupadd -r rais && useradd -r -g rais rais
 RUN apt-get update -y && apt-get upgrade -y && \
     apt-get install -y libopenjp2-7 imagemagick
 
-ENV RAIS_TILEPATH /var/local/images
-ENV RAIS_PLUGINS "*.so"
+ENV RAIS_TILEPATH=/var/local/images
+ENV RAIS_PLUGINS="*.so"
 RUN touch /etc/rais.toml && chown rais:rais /etc/rais.toml
 COPY --from=build /opt/rais-src/bin /opt/rais/
 

docker/Dockerfile-alpine

@@ -43,8 +43,8 @@ RUN addgroup -S rais && adduser -S rais -G rais
 RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 RUN apk add --no-cache openjpeg
 
-ENV RAIS_TILEPATH /var/local/images
-ENV RAIS_PLUGINS "-"
+ENV RAIS_TILEPATH=/var/local/images
+ENV RAIS_PLUGINS="-"
 RUN touch /etc/rais.toml && chown rais:rais /etc/rais.toml
 
 # Though we compile everything, we want our default alpine image tiny, so we offer *no* plugins

docker/README.md

@@ -1,17 +1,14 @@
-Docker
-===
+# Docker
 
 This directory contains everything necessary to run RAIS under Docker,
-including a test image for the docker-compose-based demo.
+including a test image for the compose-based demo.
 
-Building docker images
----
+## Building docker images
 
 The easiest way to use these is from the parent directory's `Makefile` via
 `make docker`.
 
-Running the demo
----
+## Running the demo
 
 From the project root:
 
@@ -23,5 +20,5 @@ export URL=http://192.168.0.5
 cp /some/jp2/sources/*.jp2 ./docker/images/
 
 # Run nginx and RAIS
-docker-compose up
+docker compose up
 ```

docker/demo-rais-entry.sh

@@ -10,7 +10,7 @@ if test "$url" = ""; then
   echo "No URL provided; defaulting to 'http://localhost'"
   echo "If you can't see images, try an explicitly-set URL, e.g.:"
   echo
-  echo "    URL="http://192.168.0.5" docker-compose up"
+  echo "    URL="http://192.168.0.5" docker compose up"
   url="http://localhost"
 fi
 

docker/hub.md

@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`4`, `4.1`, `4.1.4`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.1.4/docker/Dockerfile)
-- [`4-alpine`, `4.1-alpine`, `4.1.4-alpine`, `alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.1.4/docker/Dockerfile-alpine)
+- [`4`, `4.2`, `4.2.0`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.2.0/docker/Dockerfile)
+- [`4-alpine`, `4.2-alpine`, `4.2.0-alpine`, `alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.2.0/docker/Dockerfile-alpine)
 - [`3`, `3.3`, `3.3.2`, (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.2/docker/Dockerfile)
 - [`3-alpine`, `3.3-alpine`, `3.3.2-alpine` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.2/docker/Dockerfile-alpine)
 

docker/s3demo/README.md

@@ -29,7 +29,7 @@ alpine image is *much* faster to build, but doesn't contain any plugins.
 
 Once that's done, you will want to put an override for the s3 demo so it uses
 your local image.  Something like this can be put into
-`docker-compose.override.yml` in this (the s3demo) directory:
+`compose.override.yml` in this (the s3demo) directory:
 
 ```
 version: "3.4"
@@ -54,7 +54,7 @@ default.  No actual S3 environment necessary!
 
 Run the minio container:
 
-`docker-compose up minio`
+`docker compose up minio`
 
 Create images:
 
@@ -84,7 +84,7 @@ here, however, so if you are unfamiliar with AWS, go with the easy way above.
 
 ### Start the stack
 
-Run `docker-compose up` and visit `http://localhost`.  Gaze upon your glorious
+Run `docker compose up` and visit `http://localhost`.  Gaze upon your glorious
 images, lovingly served up by RAIS.
 
 Caveats
@@ -99,7 +99,7 @@ production use.  Some caveats:
 - If you have non-images in your S3 bucket, behavior is undefined
 - If you're running anything else on your server at port 80, this demo won't
   work as-is.  You may have to customize your setup (e.g., with a
-  `docker-compose.override.yml` file)
+  `compose.override.yml` file)
 
 Development
 ---
@@ -108,5 +108,5 @@ Don't hack up the demo unless you want pain.  The demo server is a mess, and
 the setup is a little hacky.  It's here to provide a quick demo, not showcase
 elegant solutions to a problem.
 
-If you are a masochist, however, make sure you re-run "docker-compose build"
+If you are a masochist, however, make sure you re-run "docker compose build"
 anytime you change the codebase or the go templates.