Browse Source

Fixed handling of Docker image tags for release builds. (#10615)

Austin S. Hemmelgarn 4 years ago
parent
commit
237ea440eb
2 changed files with 4 additions and 2 deletions
  1. 1 1
      .github/workflows/docker.yml
  2. 3 1
      .travis.yml

+ 1 - 1
.github/workflows/docker.yml

@@ -17,7 +17,7 @@ on:
     inputs:
       version:
         name: Version Tag
-        default: latest
+        default: nightly
         required: true
 jobs:
   docker-build:

+ 3 - 1
.travis.yml

@@ -353,7 +353,9 @@ jobs:
       after_failure: post_message "TRAVIS_MESSAGE" "<!here> Draft release submission failed"
 
     - name: Trigger Docker image build and publish
-      script: .travis/trigger_docker_build.sh "${GITHUB_TOKEN}" "${BUILD_VERSION}"
+      script:
+        - git checkout "${TRAVIS_BRANCH}" && export BUILD_VERSION="$(cat packaging/version | cut -d'-' -f1)"
+        - .travis/trigger_docker_build.sh "${GITHUB_TOKEN}" "${BUILD_VERSION}"
       after_failure: post_message "TRAVIS_MESSAGE" "<!here> Failed to trigger docker build during release" "${NOTIF_CHANNEL}"
 
     - stage: Trigger deb and rpm package build (release)