diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000000000000000000000000000000000000..6241630008f6dcfe11c2e5a4f45f07f06f5f8b9f --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,25 @@ +[bumpversion] +current_version = 1.0.0-rc.0 +commit = True +tag = True +parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))? +serialize = + {major}.{minor}.{patch}-{release}.{build} + {major}.{minor}.{patch} +tag_name = release-{new_version} + +[bumpversion:part:release] +optional_value = final +first_value = alpha +values = + alpha + beta + rc + final + +[bumpversion:file:.bumpversion.cfg] +search = current_version = {current_version} + +[bumpversion:glob:**/Dockerfile] +search = version="{current_version}" +replace = version="{new_version}" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de2ece8a34372a189edb70a8e79aef700e7a5c24..fd0433470238bc16a8b0976aed96ff06de3a12da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: - build -build-master: +build-tags: image: docker:latest stage: build services: @@ -52,7 +52,6 @@ build-master: - docker push "$IMAGE_6":$VERSION_6 - docker push "$IMAGE_6":latest only: - - master - tags build: image: docker:latest @@ -83,4 +82,4 @@ build: - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build except: - - master + - tags diff --git a/cache/Dockerfile b/cache/Dockerfile index 4653a2a727929a0851551864e3300af66a29ed45..82eeebfe21789b34e7098608399a7c0a03e6a892 100644 --- a/cache/Dockerfile +++ b/cache/Dockerfile @@ -31,7 +31,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ type="prism view server cache" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root ADD install.sh \ diff --git a/client/Dockerfile b/client/Dockerfile index 9da01c45e88e4e9e28b8854bae6f7554d9d9bf5e..dc0288013eb484234ecd6665f600aaffb42f34af 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -31,6 +31,6 @@ LABEL name="prism view server client" \ vendor="EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ type="prism view server client" \ - version="0.0.1-dev" + version="1.0.0-rc.0" COPY html/ /usr/share/nginx/html/ diff --git a/core/Dockerfile b/core/Dockerfile index 4bdce96b93bfd307939fd8fb122f54b4ca933c62..2ce3281f8c72af86495f32bc98c3a33d4c4857b5 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -31,7 +31,7 @@ LABEL name="prism view server core" \ vendor="EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ type="prism view server core" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile index fb2dfae9469b57e2afd689b7b9b28b7cdee3432c..d61f9bec1563820dcfa53b6e7b67e7764fd297b4 100644 --- a/fluentd/Dockerfile +++ b/fluentd/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ type="prism view server fluentd" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root RUN gem install fluent-plugin-elasticsearch \ diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile index 61afce217f6e28ee66023eadb0cd0047336f68b4..9691c29b936eb0dfe538387f7be3ec23c420554e 100644 --- a/ingestor/Dockerfile +++ b/ingestor/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \ type="prism view server ingestor" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root ADD install.sh requirements.txt \ diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile index b7da584f7aa2e019516b9c64c87342ce2f155486..f85b597ac93bf48ed23f86eb87ed92008642ef5e 100644 --- a/preprocessor/Dockerfile +++ b/preprocessor/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \ vendor="EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ type="prism view server preprocessor" \ - version="0.0.1-dev" + version="1.0.0-rc.0" ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8