Explorar el Código

Merge pull request #16067 from jfrazelle/fix-release-branch-in-suites-script

fix release branch in suites.sh
Jessie Frazelle hace 9 años
padre
commit
9b072fb722
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      contrib/reprepro/suites.sh

+ 2 - 1
contrib/reprepro/suites.sh

@@ -8,4 +8,5 @@ targets_from() {
        git ls-tree -r --name-only origin/master contrib/builder/deb | grep '/Dockerfile$' | sed -r 's!^contrib/builder/deb/|-debootstrap|/Dockerfile$!!g'
 }
 
-{ targets_from master; targets_from release; } | sort -u
+release_branch=$(git ls-remote --heads https://github.com/docker/docker.git | awk -F 'refs/heads/' '$2 ~ /^release/ { print $2 }' | sort -V | tail -1)
+{ targets_from master; targets_from "$release_branch"; } | sort -u