diff --git a/CHANGELOG.md b/CHANGELOG.md index 64dfd88..331f56c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.21.5-7] - 2022-09-20 +### Changed +- Update ces-confd to 0.7.0 #61 + ## [v1.21.5-6] - 2022-06-07 ### Changed diff --git a/Dockerfile b/Dockerfile index c9da69a..db3c844 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,10 +26,10 @@ RUN set -x -o errexit \ FROM registry.cloudogu.com/official/base:3.15.3-1 LABEL maintainer="hello@cloudogu.com" \ NAME="official/nginx" \ - VERSION="1.21.5-6" + VERSION="1.21.5-7" -ENV CES_CONFD_VERSION=0.6.0 \ - CES_CONFD_TAR_SHA256="069d45503149d67585e7ff15ce5cb1fe125c4cda4f69230dbf65851ccd88ad58" \ +ENV CES_CONFD_VERSION=0.7.0 \ + CES_CONFD_TAR_SHA256="21568a5293208e8d806382087640418fb593bffec52587bb6669efd2ae561d41" \ WARP_MENU_VERSION=1.6.0 \ WARP_MENU_TAR_SHA256="297c910ce2287e5322e3f447408e1ccfbc835874983dbab347b21892c74c8a5f" \ CES_ABOUT_VERSION=0.2.2 \ diff --git a/dogu.json b/dogu.json index 83ba59e..61994bc 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/nginx", - "Version": "1.21.5-6", + "Version": "1.21.5-7", "DisplayName": "Nginx", "Description": "Nginx WebServer.", "Logo": "https://cloudogu.com/images/dogus/nginx.png", @@ -15,7 +15,8 @@ "Dependencies": [ { "type": "dogu", - "name": "registrator" + "name": "registrator", + "version": ">=0.10.0-1" } ], "Configuration": [ diff --git a/resources/etc/ces-confd/templates/app.conf.tpl b/resources/etc/ces-confd/templates/app.conf.tpl index a0776b2..80212f5 100644 --- a/resources/etc/ces-confd/templates/app.conf.tpl +++ b/resources/etc/ces-confd/templates/app.conf.tpl @@ -42,6 +42,9 @@ server { {{range .Services}} location /{{.Location}} { {{if eq .HealthStatus "healthy" "" }} + {{ if .Rewrite }} + rewrite ^/{{ .Rewrite.Pattern }}(/|$)(.*) {{ .Rewrite.Rewrite }}/$2 break; + {{end}} proxy_pass {{.URL}}; {{else}} error_page 503 /errors/starting.html;