Преглед изворни кода

Replace illegal characters in build image tag.

Some packages have characters such as tilde (~) in their version
strings, which cannot be used inside Docker image tags.

See https://docs.docker.com/engine/reference/commandline/tag/
Ilyas Gasanov пре 6 година
родитељ
комит
04f55c9042
1 измењених фајлова са 2 додато и 1 уклоњено
  1. 2 1
      baiji

+ 2 - 1
baiji

@@ -25,6 +25,7 @@ import hashlib
 import shutil
 import sys
 import os
+import re
 
 # Python decorator voodoo to simplify argparse subparser setup.
 
@@ -190,7 +191,7 @@ def build(args):
 
     build_image_hash = hashlib.sha1(dummy["Depends"]).hexdigest()
     build_image_name = "baiji/build/{}".format(dsc["Source"])
-    build_image_vers = "{}-{}".format(dsc["Version"], build_image_hash)
+    build_image_vers = "{}-{}".format(re.sub("[^\w.-]", "_", dsc["Version"]), build_image_hash)
     build_image      = "{}:{}".format(build_image_name, build_image_vers)
 
     with Docker("image", "ls", build_image_name, "--format", "{{.Tag}}",