EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 952e5223 authored by Lubomir Dolezal's avatar Lubomir Dolezal
Browse files

initial Dockerfile versions and bumpversion config

parent 323cc045
No related branches found
No related tags found
2 merge requests!36Staging to master to prepare 1.0.0 release,!33Builds bumpversion
[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}"
...@@ -5,7 +5,7 @@ stages: ...@@ -5,7 +5,7 @@ stages:
- build - build
build-master: build-tags:
image: docker:latest image: docker:latest
stage: build stage: build
services: services:
...@@ -52,7 +52,6 @@ build-master: ...@@ -52,7 +52,6 @@ build-master:
- docker push "$IMAGE_6":$VERSION_6 - docker push "$IMAGE_6":$VERSION_6
- docker push "$IMAGE_6":latest - docker push "$IMAGE_6":latest
only: only:
- master
- tags - tags
build: build:
image: docker:latest image: docker:latest
...@@ -83,4 +82,4 @@ build: ...@@ -83,4 +82,4 @@ build:
- cd ./testing && ./gitlab_test.sh - cd ./testing && ./gitlab_test.sh
- if [ $? -ne 0 ]; then exit 1; fi # actually fail build - if [ $? -ne 0 ]; then exit 1; fi # actually fail build
except: except:
- master - tags
...@@ -31,7 +31,7 @@ LABEL name="prism view server cache" \ ...@@ -31,7 +31,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server cache" \ type="prism view server cache" \
version="0.0.1-dev" version="1.0.0-rc.0"
USER root USER root
ADD install.sh \ ADD install.sh \
......
...@@ -31,6 +31,6 @@ LABEL name="prism view server client" \ ...@@ -31,6 +31,6 @@ LABEL name="prism view server client" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server client" \ type="prism view server client" \
version="0.0.1-dev" version="1.0.0-rc.0"
COPY html/ /usr/share/nginx/html/ COPY html/ /usr/share/nginx/html/
...@@ -31,7 +31,7 @@ LABEL name="prism view server core" \ ...@@ -31,7 +31,7 @@ LABEL name="prism view server core" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server core" \ type="prism view server core" \
version="0.0.1-dev" version="1.0.0-rc.0"
USER root USER root
......
...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ ...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server fluentd" \ type="prism view server fluentd" \
version="0.0.1-dev" version="1.0.0-rc.0"
USER root USER root
RUN gem install fluent-plugin-elasticsearch \ RUN gem install fluent-plugin-elasticsearch \
......
...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ ...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
type="prism view server ingestor" \ type="prism view server ingestor" \
version="0.0.1-dev" version="1.0.0-rc.0"
USER root USER root
ADD install.sh requirements.txt \ ADD install.sh requirements.txt \
......
...@@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \ ...@@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server preprocessor" \ type="prism view server preprocessor" \
version="0.0.1-dev" version="1.0.0-rc.0"
ENV LC_ALL=C.UTF-8 ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment