aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlyas Gasanov <torso.nafi@gmail.com>2019-04-14 00:05:19 +0300
committerRob Austein <sra@hactrn.net>2019-04-15 16:47:00 +0000
commit04f55c9042b4e09ec1914bf1923d5181ef5b2514 (patch)
treea66cf007e0659bb165b60171d833b17ef28dd324
parent3d443e9cb4a55f6653e6795b4af53c957c2e8bfa (diff)
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/
-rwxr-xr-xbaiji3
1 files changed, 2 insertions, 1 deletions
diff --git a/baiji b/baiji
index 1bed0f1..c493e03 100755
--- a/baiji
+++ b/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}}",