fix(docker): infer BUILD_VERSION from environment

victronenergy · Sep 10, 2024 · 6770b9c · 6770b9c
1 parent b79455f
commit 6770b9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/docker_main.yaml b/.github/workflows/docker_main.yaml
@@ -27,6 +27,7 @@ jobs:
        env:
          OWNER: ${{ secrets.DOCKERHUB_USERNAME }}
          VERSION: ${{ github.ref_name }}
+         BUILD_VERSION: ${{ github.ref_name }}
        run: |
          (cd docker && ./build-release-images.sh $VERSION)
 
diff --git a/docker/build-dev-image.sh b/docker/build-dev-image.sh
@@ -9,7 +9,7 @@ BUILD_OPTS="--pull --progress=plain"
 
 TAG="$OWNER/$TARGET:${VER}"
 
-BUILD_VERSION=$(git describe --tags)
+BUILD_VERSION=${BUILD_VERSION:=$(git describe --tags)}
 
 # Note that we are invoking `docker build` from our parent directory
 # with -f pointing towards our custom Dockerfile

diff --git a/docker/build-release-images.sh b/docker/build-release-images.sh
@@ -20,7 +20,7 @@ MAJMIN=$(echo $VER | grep -Eo '[0-9]+\.[0-9]+')
 # Optionally tag docker image with major.minor if $VER matches SemVer spec
 [[ ! -z "$MAJMIN" ]] && TAG_MAJMIN="-t $OWNER/$TARGET:$MAJMIN"
 
-BUILD_VERSION=$(git describe --tags)
+BUILD_VERSION=${BUILD_VERSION:=$(git describe --tags)}
 
 # Note that we are invoking `docker build` from our parent directory
 # with -f pointing towards our custom Dockerfile