diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2024-03-12 21:28:41 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2024-03-12 21:28:41 -0400 |
| commit | e814ac9e83259f69c9dea6d5f1a28b89956906d9 (patch) | |
| tree | 4c27ae91263a7968327555b6777cbe1ff0e035df | |
| parent | 145f78b8b86d97b710ea9bef9131ef13c2b70534 (diff) | |
Version the project, to couple the builder to the final product
| -rwxr-xr-x | tools/build-builder | 1 | ||||
| -rwxr-xr-x | tools/build-caddy | 2 | ||||
| -rwxr-xr-x | tools/version | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/tools/build-builder b/tools/build-builder index 6a48cd1..4391f45 100755 --- a/tools/build-builder +++ b/tools/build-builder @@ -7,6 +7,7 @@ cd "$(dirname "$0")/.." docker build \ + --tag "caddy-builder:$(tools/version)" \ --tag caddy-builder:latest \ --file Dockerfile.builder \ . diff --git a/tools/build-caddy b/tools/build-caddy index f20dccc..195f7a1 100755 --- a/tools/build-caddy +++ b/tools/build-caddy @@ -13,5 +13,5 @@ docker run \ --interactive \ --tty \ --volume "$PWD/target:/app" \ - caddy-builder:latest \ + "caddy-builder:$(tools/version)" \ xcaddy build diff --git a/tools/version b/tools/version new file mode 100755 index 0000000..56f0ddb --- /dev/null +++ b/tools/version @@ -0,0 +1,10 @@ +#!/bin/bash -e + +## tools/version +## +## Prints a version number for this project. Version information comes from Git. + +git describe \ + --always \ + --dirty \ + --tags |