For untagged commits, include hash in version name (fixes #1563)

diff --git a/.dockerignore b/.dockerignore
index 3a0f82b48887f4c80d894ef98fed995f60bc9527..b3bb4eb26d6db56a4febe2901aec0b34ffbcaf0c 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,5 +4,4 @@ docker
 api_tests
 ansible
 tests
-.git
 *.sh

diff --git a/crates/utils/src/version.rs b/crates/utils/src/version.rs
index 397d2a429071fa478c0f875ff5f82a257e552db9..ac0896a3c9fd6247c98fa9199f52ca91ee0294a6 100644 (file)
--- a/crates/utils/src/version.rs
+++ b/crates/utils/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.10.3";
+pub const VERSION: &str = "unknown version";

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 5d2acec7faf9a1192de816c803ad5307cd668e1c..4b7dc3ad4d55cd65b785bc4e4e906b30934a30ab 100644 (file)
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -36,6 +36,7 @@ COPY --from=cacher /home/rust/.cargo /home/rust/.cargo
 COPY ./ ./
 
 RUN sudo chown -R rust:rust .
+RUN echo "pub const VERSION: &str = \"$(git describe --tag)\";" > "crates/utils/src/version.rs"
 RUN cargo build
 
 # reduce binary size

diff --git a/docker/dev/volume_mount.dockerfile b/docker/dev/volume_mount.dockerfile
index 00d9c47357efc4af9f8edfd6660ac2e53fe47fde..6d9fa996c8d3bec6d9c63cbaa95a74317dcb66a0 100644 (file)
--- a/docker/dev/volume_mount.dockerfile
+++ b/docker/dev/volume_mount.dockerfile
@@ -9,6 +9,7 @@ WORKDIR /app
 
 # Copy the source folders
 COPY . ./
+RUN echo "pub const VERSION: &str = \"$(git describe --tag)\";" > "crates/utils/src/version.rs"
 
 # Build for debug
 RUN --mount=type=cache,target=/usr/local/cargo/registry \

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 75c53e67527bb5b0cea8fbd4051bcafb43e42039..b869a76671f21af2aa0892e69ac1d12300db3874 100644 (file)
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -9,6 +9,7 @@ WORKDIR /app
 COPY ./ ./
 
 RUN sudo chown -R rust:rust .
+RUN echo "pub const VERSION: &str = \"$(git describe --tag)\";" > "crates/utils/src/version.rs"
 RUN cargo build --release
 
 # reduce binary size

diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm
index b3eacb4f9f41ea6d29eb5849dc019747ede67dfe..01f24456e239d3a54a306c31f7508d734b2c6d0f 100644 (file)
--- a/docker/prod/Dockerfile.arm
+++ b/docker/prod/Dockerfile.arm
@@ -11,6 +11,7 @@ RUN apt-get update \
 WORKDIR /app
 
 COPY ./ ./
+RUN echo "pub const VERSION: &str = \"$(git describe --tag)\";" > "crates/utils/src/version.rs"
 
 RUN cargo build --release
 

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 7520f1495abd6cce7dd69b324bb4d7eb74693647..d72a74e8e5309a2e72152b91acd37723505b1590 100755 (executable)
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -6,12 +6,6 @@ set -e
 new_tag="$1"
 third_semver=$(echo $new_tag | cut -d "." -f 3)
 
-# Setting the version on the backend
-pushd ../../
-echo "pub const VERSION: &str = \"$new_tag\";" > "crates/utils/src/version.rs"
-git add "crates/utils/src/version.rs"
-popd
-
 # The ansible and docker installs should only update for non release-candidates
 # IE, when the third semver is a number, not '2-rc'
 if [ ! -z "${third_semver##*[!0-9]*}" ]; then