Merge branch 'hotfix-2.9.5'

Resolved issue with cache_memory introduced in 2.9.4
minotar · Feb 11, 2018 · 26dfd05 · 26dfd05
2 parents 68b91e0 + a6e6aaf
commit 26dfd05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,5 +12,5 @@ RUN apk --no-cache add ca-certificates
 COPY --from=builder /go/bin/imgd /imgd
 COPY config.example.gcfg /config.gcfg
 ENTRYPOINT ./imgd
-LABEL Name=imgd Version=2.9.4
+LABEL Name=imgd Version=2.9.5
 EXPOSE 8000
diff --git a/cache_memory.go b/cache_memory.go
@@ -17,7 +17,7 @@ const (
 
 	// Based off those, calculate the maximum number of skins we'll store
 	// in memory.
-	skinCount = skinSize / cacheSize
+	skinCount = cacheSize / skinSize
 )
 
 // Cache object that stores skins in memory.

diff --git a/main.go b/main.go
@@ -16,7 +16,7 @@ const (
 	MinWidth     = uint(8)
 	MaxWidth     = uint(300)
 
-	ImgdVersion = "2.9.4"
+	ImgdVersion = "2.9.5"
 )
 
 var (