Merge branch 'release/4.0.1' into main

Author: jechols

Makefile

@@ -49,16 +49,25 @@ clean:
 	rm -f src/transform/rotation.go
 	rm -f src/version/build.go
 
+distclean: clean
+	go clean -modcache -testcache -cache
+	docker rmi uolibraries/rais:build || true
+	docker rmi uolibraries/rais:build-alpine || true
+	docker rmi uolibraries/rais:dev || true
+	docker rmi uolibraries/rais:dev-alpine || true
+
 # Generate the docker images
 docker: | force-getbuild generate
+	docker pull golang:1
+	docker pull golang:1-alpine
 	docker build --rm --target build -f $(MakefileDir)/docker/Dockerfile -t uolibraries/rais:build $(MakefileDir)
-	docker build --rm -f $(MakefileDir)/docker/Dockerfile -t uolibraries/rais:latest-indev $(MakefileDir)
+	docker build --rm -f $(MakefileDir)/docker/Dockerfile -t uolibraries/rais:dev $(MakefileDir)
 	make docker-alpine
 
 # Build just the alpine image for cases where we want to get this updated / cranked out fast
 docker-alpine: | force-getbuild generate
 	docker build --rm --target build -f $(MakefileDir)/docker/Dockerfile-alpine -t uolibraries/rais:build-alpine $(MakefileDir)
-	docker build --rm -f $(MakefileDir)/docker/Dockerfile-alpine -t uolibraries/rais:latest-alpine $(MakefileDir)
+	docker build --rm -f $(MakefileDir)/docker/Dockerfile-alpine -t uolibraries/rais:dev-alpine $(MakefileDir)
 
 # Build plugins on any change to their directory or their go files
 bin/plugins/%.so : src/plugins/% src/version/build.go src/plugins/%/*.go

docker-compose.override-example.yml

@@ -15,28 +15,25 @@
 version: "3.4"
 services:
   rais:
-    # Uncomment this if you'd like to fire up an Alpine-based container - note
-    # that it doesn't have any configuration baked in, so you'll have to use
-    # environment vars for *all configuration*.  Good for production, but bad
-    # for a quick demo.
-    #image: uolibraries/rais:latest-alpine
+    # Uncomment one of these if you'd like to use an image built by `make
+    # docker` rather than testing out the latest uploaded image
+    #image: uolibraries/rais:dev
+    #image: uolibraries/rais:dev-alpine
+
     environment:
       # These next lines would allow you to pass the various S3 configuration
       # options through from the host's environment (or the local .env file)
-      - RAIS_S3CACHE
-      - RAIS_S3ZONE
-      - RAIS_S3ENDPOINT
+      - RAIS_S3_ENDPOINT
+      - RAIS_S3_DISABLESSL
+      - RAIS_S3_FORCEPATHSTYLE
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
+      - AWS_REGION
       - AWS_SESSION_TOKEN
+
       # If you wanted to use a configured AWS credentials file for s3, do this
       # and then see the volume config below
       - AWS_SHARED_CREDENTIALS_FILE=/etc/aws.credentials
-    volumes:
-      # Mount in all binaries so you aren't rebuilding the image to test quick changes
-      - ./bin:/opt/rais:ro
-      # Volume config (modify source) for using an AWS credentials file
-      - /home/myuser/.aws/credentials:/etc/aws.credentials
     ports:
       - 12415:12415
       - 12416:12416

docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - URL
       - RAIS_ADDRESS
       - RAIS_LOGLEVEL
-      - RAIS_TILEPATH
+      - RAIS_TILEPATH=/var/local/images
       - RAIS_IIIFWEBPATH
       - RAIS_IIIFBASEURL
       - RAIS_INFOCACHELEN

docker/Dockerfile

@@ -7,37 +7,12 @@
 #
 #     # Generate the build image to simplify local development
 #     docker build --rm -t uolibraries/rais:build --target build -f ./docker/Dockerfile .
-FROM fedora:32 AS build
+FROM golang:1 AS build
 LABEL maintainer="Jeremy Echols <jechols@uoregon.edu>"
 
 # Install all the build dependencies
-RUN dnf update -y
-RUN dnf upgrade -y
-RUN dnf install -y openjpeg2-devel
-RUN dnf install -y ImageMagick-devel
-RUN dnf install -y git
-RUN dnf install -y gcc
-RUN dnf install -y make
-RUN dnf install -y tar
-RUN dnf install -y findutils
-
-# Installing GraphicsMagick is wholly unnecessary, but helps when using the
-# build box for things like converting images.  Since opj2_encode doesn't
-# support all formats, and ImageMagick has been iffy with some conversions for
-# us, "gm convert" is a handy fallback.  As this is a multi-stage dockerfile,
-# this installation doesn't hurt the final production docker image.
-RUN dnf install -y GraphicsMagick
-
-# Go comes after other installs to avoid re-pulling the more expensive
-# dependencies when changing Go versions
-RUN curl -L https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz > /tmp/go.tgz
-RUN cd /opt && tar -xzf /tmp/go.tgz
-
-# "Install" Go
-RUN mkdir -p /usr/local/go
-ENV GOPATH /usr/local/go
-ENV GOROOT /opt/go
-ENV PATH /opt/go/bin:/usr/local/go/bin:$PATH
+RUN apt-get update -y && apt-get upgrade -y && \
+    apt-get install -y libopenjp2-7-dev libmagickcore-dev git gcc make tar findutils
 
 # Make sure the build box can lint code
 RUN go get -u golang.org/x/lint/golint
@@ -59,16 +34,19 @@ RUN make
 # Manually build the ImageMagick plugin since we exclude it by default
 RUN make bin/plugins/imagick-decoder.so
 
+
+
 # Production image just installs runtime deps and copies in the binaries
-FROM fedora:30 AS production
+FROM debian:buster AS production
 LABEL maintainer="Jeremy Echols <jechols@uoregon.edu>"
 
 # Stolen from mariadb dockerfile: add our user and group first to make sure
 # their IDs get assigned consistently
 RUN groupadd -r rais && useradd -r -g rais rais
 
-# Deps
-RUN dnf update -y && dnf upgrade -y && dnf install -y openjpeg2 ImageMagick
+# Install the core dependencies needed for both build and production
+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"

docker/demo-rais-entry.sh

@@ -6,7 +6,7 @@
 # Copy the config and edit it in-place; this allows customizing most pieces of
 # configuration for demoing
 url=${URL:-}
-if test "$url" == ""; then
+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

docker/hub.md

@@ -1,11 +1,9 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`3`, `3.3`, `3.3.1`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.1/docker/Dockerfile)
-- [`alpine`, `3-alpine`, `3.3-alpine`, `3.3.1-alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.1/docker/Dockerfile-alpine)
-- [`3.2`, `3.2.1` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.2.1/docker/Dockerfile)
-- [`3.1`, `3.1.1` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.1.1/docker/Dockerfile)
-- [`3.0`, `3.0.1` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.0.1/docker/Dockerfile)
-- [`2.11`, `2.11.2` (*docker/Dockerfile.prod*)](https://github.com/uoregon-libraries/rais-image-server/blob/v2.11.2/docker/Dockerfile.prod)
+- [`4`, `4.0`, `4.0.1`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.0.1/docker/Dockerfile)
+- [`4-alpine`, `4.0-alpine`, `4.0.1-alpine`, `alpine` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.0.1/docker/Dockerfile-alpine)
+- [`3`, `3.3`, `3.3.1` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.1/docker/Dockerfile)
+- [`3-alpine`, `3.3-alpine`, `3.3.1-alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.1/docker/Dockerfile-alpine)
 
 # RAIS
 

src/cmd/rais-server/config.go

@@ -81,7 +81,7 @@ func parseConf() {
 	pflag.Parse()
 
 	// Make sure required values exist
-	if !viper.IsSet("TilePath") {
+	if viper.GetString("TilePath") == "" {
 		fmt.Println("ERROR: tile path is required")
 		pflag.Usage()
 		os.Exit(1)

src/cmd/rais-server/main.go

@@ -76,6 +76,7 @@ func main() {
 	address := viper.GetString("Address")
 	adminAddress := viper.GetString("AdminAddress")
 
+	Logger.Debugf("Serving images from %q", tilePath)
 	ih := NewImageHandler(tilePath, webPath)
 	ih.Maximums.Area = viper.GetInt64("ImageMaxArea")
 	ih.Maximums.Width = viper.GetInt("ImageMaxWidth")

src/version/version.go

@@ -3,4 +3,4 @@
 package version
 
 // Version tells us the app version string
-const Version = "4.0.0"
+const Version = "4.0.1"