From ff7814c93dfb9cbdf5f30196d677de3f5ce6fc71 Mon Sep 17 00:00:00 2001 From: Christian Beyer Date: Thu, 26 Oct 2023 18:22:06 +0200 Subject: [PATCH 1/4] #80 update ces-about - update to 0.4.0-rc1 - include additional routes --- CHANGELOG.md | 3 +++ Dockerfile | 10 ++++++---- resources/etc/nginx/include.d/info.conf | 6 ++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abdd1d4..f3e5d91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- Update `ces-about` to `0.4.0` (#80) +- Use additional routes provided by `ces-about` (#80) ## [v1.23.2-7] - 2023-07-10 ### Changed diff --git a/Dockerfile b/Dockerfile index 743c98b..676457d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,8 @@ ENV NGINX_VERSION=1.23.2 \ CES_CONFD_TAR_SHA256="365a4033e80af6953d5b6513296a828dfd772a6640533bb51dd9abd34a1e53e8" \ WARP_MENU_VERSION=1.7.3 \ WARP_MENU_TAR_SHA256="b3ed4b50b1b9a739a4430d88975b5e3030c5e542c0739ed6b72d7eb8fd9a7b18" \ - CES_ABOUT_VERSION=0.2.2 \ - CES_ABOUT_TAR_SHA256="9926649be62d8d4667b2e7e6d1e3a00ebec1c4bbc5b80a0e830f7be21219d496" \ + CES_ABOUT_VERSION="0.4.0-rc2" \ + CES_ABOUT_TAR_SHA256="3965bb8b0014cf18d3e1b5db8e31ebfc7781d82c2ac4ec6bfbf944be6b3e637d" \ CES_THEME_VERSION=0.7.0 \ CES_THEME_TAR_SHA256="d3c8ba654cdaccff8fa3202f3958ac0c61156fb25a288d6008354fae75227941" @@ -40,10 +40,12 @@ RUN wget --progress=bar:force:noscroll -O "/tmp/ces-confd-${CES_CONFD_VERSION}.t && mkdir -p /build/var/www/customhtml # install ces-about page -RUN wget --progress=bar:force:noscroll -O /tmp/ces-about-v${CES_ABOUT_VERSION}.tar.gz https://github.com/cloudogu/ces-about/releases/download/v${CES_ABOUT_VERSION}/ces-about-v${CES_ABOUT_VERSION}.tar.gz \ +RUN wget --progress=bar:force:noscroll -O /tmp/ces-about-v${CES_ABOUT_VERSION}.tar.gz https://github.com/cloudogu/ces-about/releases/download/v${CES_ABOUT_VERSION}/ces-about_v${CES_ABOUT_VERSION}.tar.gz \ && echo "${CES_ABOUT_TAR_SHA256} */tmp/ces-about-v${CES_ABOUT_VERSION}.tar.gz" | sha256sum -c - \ && tar -xzvf /tmp/ces-about-v${CES_ABOUT_VERSION}.tar.gz -C /build/var/www/html \ - && sed -i 's@base href=".*"@base href="/info/"@' /build/var/www/html/info/index.html + && mkdir -p /build/etc/nginx/include.d/ \ + && cp /build/var/www/html/routes/ces-about-routes.conf /build/etc/nginx/include.d/ \ + && rm -rf /build/var/www/html/routes # install warp menu RUN wget --progress=bar:force:noscroll -O /tmp/warp.zip https://github.com/cloudogu/warp-menu/releases/download/v${WARP_MENU_VERSION}/warp-v${WARP_MENU_VERSION}.zip \ diff --git a/resources/etc/nginx/include.d/info.conf b/resources/etc/nginx/include.d/info.conf index 23b819f..a5745cc 100644 --- a/resources/etc/nginx/include.d/info.conf +++ b/resources/etc/nginx/include.d/info.conf @@ -2,7 +2,5 @@ location /info { root /var/www/html; - # fallback to index.html if file could not be found - # required for angular navigation - try_files $uri $uri/ /info/index.html; -} \ No newline at end of file + include /etc/nginx/include.d/ces-about-routes.conf; +} From 207985acb1b3ae2255933dcd6bc33404aa57c87d Mon Sep 17 00:00:00 2001 From: Christian Beyer Date: Tue, 7 Nov 2023 07:58:49 +0100 Subject: [PATCH 2/4] #80 update ces-about to latest release - update to 0.4.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 676457d..c43396b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,8 @@ ENV NGINX_VERSION=1.23.2 \ CES_CONFD_TAR_SHA256="365a4033e80af6953d5b6513296a828dfd772a6640533bb51dd9abd34a1e53e8" \ WARP_MENU_VERSION=1.7.3 \ WARP_MENU_TAR_SHA256="b3ed4b50b1b9a739a4430d88975b5e3030c5e542c0739ed6b72d7eb8fd9a7b18" \ - CES_ABOUT_VERSION="0.4.0-rc2" \ - CES_ABOUT_TAR_SHA256="3965bb8b0014cf18d3e1b5db8e31ebfc7781d82c2ac4ec6bfbf944be6b3e637d" \ + CES_ABOUT_VERSION="0.4.0" \ + CES_ABOUT_TAR_SHA256="553624d9dec8f2d7158014680c983e9b431d85d8c7fd59b5f96a1061863cdbf6" \ CES_THEME_VERSION=0.7.0 \ CES_THEME_TAR_SHA256="d3c8ba654cdaccff8fa3202f3958ac0c61156fb25a288d6008354fae75227941" From f04623353d82442f7d9b3e48fe09f618cc64a37e Mon Sep 17 00:00:00 2001 From: Georg Goering Date: Tue, 7 Nov 2023 09:54:33 +0100 Subject: [PATCH 3/4] Bump version --- Dockerfile | 2 +- dogu.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c43396b..8bb9ba8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,7 +61,7 @@ RUN wget --progress=bar:force:noscroll -O /tmp/theme.zip https://github.com/clou FROM registry.cloudogu.com/official/base:3.17.3-2 LABEL maintainer="hello@cloudogu.com" \ NAME="official/nginx" \ - VERSION="1.23.2-7" + VERSION="1.23.2-8" ENV CES_MAINTENANCE_MODE=false diff --git a/dogu.json b/dogu.json index 0c64a11..34684bc 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/nginx", - "Version": "1.23.2-7", + "Version": "1.23.2-8", "DisplayName": "Nginx", "Description": "Nginx WebServer.", "Logo": "https://cloudogu.com/images/dogus/nginx.png", From e0a863f748d7cd0492b77734972f55e81afcd4b8 Mon Sep 17 00:00:00 2001 From: Georg Goering Date: Tue, 7 Nov 2023 09:54:52 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3e5d91..dda6ca8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v1.23.2-8] - 2023-11-07 ### Changed - Update `ces-about` to `0.4.0` (#80) - Use additional routes provided by `ces-about` (#80)