From 3cc7a2d95d35b28373807561c8cf742e8c926506 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Fri, 14 Jun 2019 15:00:05 +0200 Subject: [PATCH 1/2] dockerignore: remove .git - needed for git hash on builds --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 3070d81c76..26f5c15f86 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1 @@ .github -.git From 5c15c0e5c78564388943a5884f0967a9fd997c7a Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Fri, 14 Jun 2019 15:25:56 +0200 Subject: [PATCH 2/2] changelog: include #1488 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a715ad531..8c4998f121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,15 @@ ## v0.4.2 (Unreleased) +### Notes + ### Features ### Improvements ### Bug fixes +* [#1488](https://github.com/ethersphere/swarm/pull/1488): docker: include git commit hash in swarm version + -### Notes ## v0.4.1 (June 13, 2019)