Skip to content

Commit

Permalink
Merge branch 'release/v1.17.10-9'
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Sprey authored and cesmarvin committed Nov 22, 2021
2 parents 8a12176 + 81d863a commit 513385e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v1.17.10-9] - 2021-11-22
### Changed
- update warp menu to version 1.3.0

## [v1.17.10-8] - 2021-11-02

### Changed
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ RUN set -x \
FROM registry.cloudogu.com/official/base:3.12.4-1
LABEL maintainer="[email protected]" \
NAME="official/nginx" \
VERSION="1.17.10-8"
VERSION="1.17.10-9"

ENV CES_CONFD_VERSION=0.5.1 \
CES_CONFD_TAR_SHA256="f8776bc473beeacda8ff502861906bb9ab6eeda365513290116697cc6f68eee8" \
WARP_MENU_VERSION=1.2.0 \
WARP_MENU_TAR_SHA256="6d2a44d09077ef04ab577cc946e60d1de79ed748a16b41df709d5958f2366fda" \
WARP_MENU_VERSION=1.3.0 \
WARP_MENU_TAR_SHA256="f1ebc305ac03a2b59d8eb9b5624a26a3e5803bb8b6969df271c702bdb257792c" \
CES_ABOUT_VERSION=0.2.2 \
CES_ABOUT_TAR_SHA256="9926649be62d8d4667b2e7e6d1e3a00ebec1c4bbc5b80a0e830f7be21219d496" \
CES_THEME_VERSION=0d20c1b1d5518af475cddb33713e58ebf57f5599 \
Expand All @@ -53,7 +53,7 @@ RUN set -x \
&& tar -xzvf ces-about-v${CES_ABOUT_VERSION}.tar.gz -C /var/www/html \
&& sed -i 's@base href=".*"@base href="/info/"@' /var/www/html/info/index.html \
# install warp menu
&& curl -Lsk https://github.com/cloudogu/warp-menu/releases/download/v${WARP_MENU_VERSION}/warp-v${WARP_MENU_VERSION}.zip -o /tmp/warp.zip \
&& curl -Lsk https://github.com/cloudogu/warp-menu/releases/download/v${WARP_MENU_VERSION}/warp-v${WARP_MENU_VERSION}.zip -o /tmp/warp.zip \
&& echo "${WARP_MENU_TAR_SHA256} */tmp/warp.zip" | sha256sum -c - \
&& unzip /tmp/warp.zip -d /var/www/html \
# install custom error pages
Expand Down
2 changes: 1 addition & 1 deletion dogu.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "official/nginx",
"Version": "1.17.10-8",
"Version": "1.17.10-9",
"DisplayName": "Nginx",
"Description": "Nginx WebServer.",
"Logo": "https://cloudogu.com/images/dogus/nginx.png",
Expand Down
Binary file added warp.zip
Binary file not shown.

0 comments on commit 513385e

Please sign in to comment.