Merge branch 'hypernext'

* hypernext: update changelog add long cache policy for assets
elabftw · Jun 16, 2021 · 0a43a9f · 0a43a9f
2 parents dc91586 + c1a76e9
commit 0a43a9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Container image version
 # Note: the version here is from Dockerfile:ELABIMG_VERSION not the tagged one
 
+# 2.5.1
+* Add long caching for assets
+
 # 2.5.0
 * Add brotli compression to nginx for assets
 

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ ARG ELABFTW_VERSION=4.0.0-beta6
 ENV ELABFTW_VERSION $ELABFTW_VERSION
 
 # this is versioning for the container image
-ARG ELABIMG_VERSION=2.5.0
+ARG ELABIMG_VERSION=2.5.1
 ENV ELABIMG_VERSION $ELABIMG_VERSION
 
 ARG S6_OVERLAY_VERSION=2.2.0.1

diff --git a/src/nginx/common.conf b/src/nginx/common.conf
@@ -52,9 +52,11 @@ location / {
 location ~ /\.          { access_log off; log_not_found off; deny all; }
 
 # disable access log for assets
-location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+location ~* \.(js|css|png|jpg|jpeg|gif|ico|map|woff)$ {
     access_log off;
     log_not_found off;
+    expires 1y;
+    add_header Cache-Control "public, no-transform";
 }
 
 # to use the RESTful api