From 952e5223820d7371603330d7c5d8daa5e5302190 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Fri, 6 Nov 2020 11:15:44 +0100
Subject: [PATCH] initial Dockerfile versions and bumpversion config
---
.bumpversion.cfg | 25 +++++++++++++++++++++++++
.gitlab-ci.yml | 5 ++---
cache/Dockerfile | 2 +-
client/Dockerfile | 2 +-
core/Dockerfile | 2 +-
fluentd/Dockerfile | 2 +-
ingestor/Dockerfile | 2 +-
preprocessor/Dockerfile | 2 +-
8 files changed, 33 insertions(+), 9 deletions(-)
create mode 100644 .bumpversion.cfg
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 00000000..62416300
--- /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 de2ece8a..fd043347 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 4653a2a7..82eeebfe 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 9da01c45..dc028801 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 4bdce96b..2ce3281f 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 fb2dfae9..d61f9bec 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 61afce21..9691c29b 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 b7da584f..f85b597a 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
--
GitLab