diff --git a/CHANGELOG.md b/CHANGELOG.md index f0cfcc9..b818a05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,3 @@ -* FEATURE - * update server to v1.14.1 - * update web-vault to v2.13.1 - * add new env variable `USER_ATTACHMENT_LIMIT` - * add new env variable `ORG_ATTACHMENT_LIMIT` +* ENHANCEMENT + * update server to v1.14.2 + * update web-vault to v2.13.2 diff --git a/Dockerfile b/Dockerfile index c350493..d52e4ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="Robert Kaussow " \ org.label-schema.vendor="Robert Kaussow" \ org.label-schema.schema-version="1.0" -ARG VAULT_VERSION=2.13.1 +ARG VAULT_VERSION=2.13.2b ADD overlay/ / diff --git a/Makefile b/Makefile index 691ca15..982383a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -export BUILD_VERSION ?= 1.14.1 +export BUILD_VERSION ?= 1.14.2 export DEBIAN_FRONTEND ?= noninteractive export LANG ?= C.UTF-8 export TZ ?= UTC @@ -21,7 +21,7 @@ build-bin: rustup set profile minimal && \ cd $(SRC) && \ rustup target add x86_64-unknown-linux-musl && \ - cargo build -j 8 --features $(DB) --release + BWRS_VERSION="$${BUILD_VERSION##v}" cargo build -j 8 --features $(DB) --release .PHONY: clean clean: