From 8171ceec81e6080920b3ea5800e1eb8f89e43f6b Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Mon, 19 Aug 2024 21:44:25 +0200
Subject: [PATCH] Release 2.5.0

---
 CHANGELOG.md | 13 +++++++++++++
 Cargo.lock   |  2 +-
 Cargo.toml   |  2 +-
 README.md    | 35 ++++++++++++++---------------------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebcf860..c7e6d33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,23 @@
 
 ## Unreleased
 
+
+## 2.5.0
+
+**2024-08-19**
+
 ### Added
 
+- Possibility to serve from some subdomain via the `WASTEBIN_BASE_URL`
+  environment variable.
+- Possibility to limit maximum paste expiration with the
+  `WASTEBIN_MAX_PASTE_EXPIRATION` environment variable.
 - Open button to read local file into input.
 
+### Changed
+
+- Improve container layout and CSS.
+
 
 ## 2.4.3
 
diff --git a/Cargo.lock b/Cargo.lock
index 24f9dbe..266229e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1935,7 +1935,7 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wastebin"
-version = "2.4.3"
+version = "2.5.0"
 dependencies = [
  "askama",
  "askama_axum",
diff --git a/Cargo.toml b/Cargo.toml
index c15a43c..c922b17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wastebin"
-version = "2.4.3"
+version = "2.5.0"
 edition = "2021"
 rust-version = "1.80"
 
diff --git a/README.md b/README.md
index ba0781f..41e18d0 100644
--- a/README.md
+++ b/README.md
@@ -40,24 +40,19 @@ contained `wastebin` binary.
 
 ### Build a container image
 
-It's possible to build container image using Docker or Podman.
-
-Assuming you're in the root directory of repository:
-* Docker
+It's possible to build a container image using Docker or Podman. Assuming you're in the root directory of repository run
 ```bash
-$ sudo docker build \
-    -t wastebin:v2.4.3 \
-    -f Dockerfile .
+$ sudo docker build -t wastebin:v2.4.3 -f Dockerfile .
 ```
-* Podman
+for Docker or
 ```bash
-$ podman build \
-    -t wastebin:v2.4.3 \
-    -f Dockerfile
+$ podman build -t wastebin:v2.4.3 -f Dockerfile
 ```
+for Podman.
 
 To cross-compile, make sure that your container engine of choice supports it,
 e.g. Docker:
+
 ```bash
 $ sudo docker buildx ls
 NAME/NODE     DRIVER/ENDPOINT   STATUS    BUILDKIT   PLATFORMS
@@ -65,18 +60,13 @@ default*      docker
  \_ default    \_ default       running   v0.14.1    linux/amd64, linux/amd64/v2, linux/386, linux/arm64, linux/riscv64, linux/ppc64, linux/ppc64le, linux/s390x, linux/mips64le, linux/mips64, linux/loong64, linux/arm/v7, linux/arm/v6
 ```
 
-To compile arm64 image on x86_64(amd64) host:
-* Docker
+To build an arm64 image on an x86_64 host run
 ```bash
-$ sudo docker build --platform linux/arm64 \
-    -t wastebin:v2.4.3-arm64 \
-    -f Dockerfile.arm .
+$ sudo docker build --platform linux/arm64 -t wastebin:v2.4.3-arm64 -f Dockerfile.arm .
 ```
-* Podman
+or 
 ```bash
-$ podman build --arch=arm64 \
-    -t wastebin:v2.4.3-arm64 \
-    -f Dockerfile.arm
+$ podman build --arch=arm64 -t wastebin:v2.4.3-arm64 -f Dockerfile.arm
 ```
 
 ### Run a Docker image
@@ -93,6 +83,7 @@ shell nor with `TMPDIR` being set. If database migrations fail with an extended
 sqlite error code 6410, pass `TMPDIR` pointing to a location, sqlite can write
 to.
 
+
 ### Run with docker-compose
 ```
 version: '3.3'
@@ -108,17 +99,19 @@ services:
 ```
 Make sure the `./data` folder is writable by the user 10001.
 
+
 ### Run with Nix
 
 For Nix users, a `flake.nix` is also provided. Build and execute it directly
 with:
 
-```sh
+```bash
 nix run 'github:matze/wastebin#wastebin'
 ```
 
 Or install the provided `wastebin` package like you normally would.
 
+
 ## Usage
 
 ### Browser interface