diff --git a/.bumpversion.cfg b/.bumpversion.cfg index aeefd700e..533085955 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,7 +3,7 @@ current_version = 1.15 commit = True tag = False allow_dirty = True -parse = (?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? +parse = (?P\d+)\.(?P\d+)\.(?P[a-z]+) serialize = {major}.{minor}{release}{num} {major}.{minor} @@ -22,7 +22,7 @@ serialize = [bumpversion:file:docker/Makefile] serialize = - {major}.{minor}{release}{num} + {major}.{minor}{release} [bumpversion:file:src/etools_datamart/__init__.py] serialize = diff --git a/docker/Makefile b/docker/Makefile index 009b0a149..611eed563 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -4,7 +4,7 @@ DATABASE_URL_ETOOLS?= DEVELOP?=0 DOCKER_PASS?= DOCKER_USER?= -TARGET?=1.15a0 +TARGET?=1.15 # below vars are used internally BUILD_OPTIONS?=--squash CMD?=datamart