Merge branch 'release/4.1.1' into main

Author: jechols

docker/hub.md

@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`4`, `4.1`, `4.1.0`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.1.0/docker/Dockerfile)
-- [`4-alpine`, `4.1-alpine`, `4.1.0-alpine`, `alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.1.0/docker/Dockerfile-alpine)
+- [`4`, `4.1`, `4.1.1`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.1.1/docker/Dockerfile)
+- [`4-alpine`, `4.1-alpine`, `4.1.1-alpine`, `alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.1.1/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/main.go

@@ -127,10 +127,3 @@ func preptemplates() {
 	assetT = template.Must(template.Must(layout.Clone()).ParseFiles("asset.go.html"))
 	adminT = template.Must(template.Must(layout.Clone()).ParseFiles("admin.go.html"))
 }
-
-type Data struct {
-	Zone      string
-	Bucket    string
-	KeyID     string
-	SecretKey string
-}

src/cmd/rais-server/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -154,7 +155,7 @@ func handle(srv *servers.Server, pattern string, handler http.Handler) {
 func shutdown() {
 	wait.Add(1)
 	Logger.Infof("Stopping RAIS...")
-	servers.Shutdown(nil)
+	servers.Shutdown(context.Background())
 
 	if len(teardownPlugins) > 0 {
 		Logger.Infof("Tearing down plugins")

src/iiif/url.go

@@ -23,14 +23,14 @@ func (id ID) Escaped() string {
 
 // URL represents the different options composed into a IIIF URL request
 type URL struct {
-	Path            string
-	ID              ID
-	Region          Region
-	Size            Size
-	Rotation        Rotation
-	Quality         Quality
-	Format          Format
-	Info            bool
+	Path     string
+	ID       ID
+	Region   Region
+	Size     Size
+	Rotation Rotation
+	Quality  Quality
+	Format   Format
+	Info     bool
 }
 
 type pathParts struct {

src/img/cloud_stream.go

@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"gocloud.dev/blob"
-	_ "gocloud.dev/blob/azureblob"
-	_ "gocloud.dev/blob/fileblob"
-	_ "gocloud.dev/blob/gcsblob"
-	_ "gocloud.dev/blob/s3blob"
+	_ "gocloud.dev/blob/azureblob" // Required for Azure support
+	_ "gocloud.dev/blob/fileblob"  // Required for local file support within the cloud streamer
+	_ "gocloud.dev/blob/gcsblob"   // Required for Google Cloud support
+	_ "gocloud.dev/blob/s3blob"    // Required for AWS S3 support
 )
 
 // Environment variables which CloudStream uses to set up S3

src/version/version.go

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