From 4cf6c36f34398140bf86f2ae963c6c9d7b7194d1 Mon Sep 17 00:00:00 2001 From: "Langhammer, Jens" Date: Mon, 22 Jul 2019 15:54:34 +0200 Subject: [PATCH] new release: 0.2.7-beta --- .bumpversion.cfg | 5 +++-- .gitlab-ci.yml | 8 ++++---- helm/passbook/Chart.yaml | 4 ++-- helm/passbook/values.yaml | 2 +- passbook/__init__.py | 2 +- passbook/core/nginx.conf | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 532ff6dfb..3b3f941d0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.6-beta +current_version = 0.2.7-beta tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-(?P.*) @@ -10,7 +10,7 @@ tag_name = version/{new_version} [bumpversion:part:release] optional_value = stable first_value = beta -values = +values = alpha beta stable @@ -24,3 +24,4 @@ values = [bumpversion:file:passbook/__init__.py] [bumpversion:file:passbook/core/nginx.conf] + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eccc0ec2c..fabcea5c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ create-base-image: before_script: - echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.base --destination docker.beryju.org/passbook/base:latest --destination docker.beryju.org/passbook/base:0.2.6-beta + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.base --destination docker.beryju.org/passbook/base:latest --destination docker.beryju.org/passbook/base:0.2.7-beta stage: build-base-image only: refs: @@ -38,7 +38,7 @@ build-dev-image: before_script: - echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.dev --destination docker.beryju.org/passbook/dev:latest --destination docker.beryju.org/passbook/dev:0.2.6-beta + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.dev --destination docker.beryju.org/passbook/dev:latest --destination docker.beryju.org/passbook/dev:0.2.7-beta stage: build-dev-image only: refs: @@ -91,7 +91,7 @@ package-passbook-server: before_script: - echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.beryju.org/passbook/server:latest --destination docker.beryju.org/passbook/server:0.2.6-beta + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.beryju.org/passbook/server:latest --destination docker.beryju.org/passbook/server:0.2.7-beta stage: build only: - tags @@ -104,7 +104,7 @@ build-passbook-static: before_script: - echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.static --destination docker.beryju.org/passbook/static:latest --destination docker.beryju.org/passbook/static:0.2.6-beta + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.static --destination docker.beryju.org/passbook/static:latest --destination docker.beryju.org/passbook/static:0.2.7-beta only: - tags - /^version/.*$/ diff --git a/helm/passbook/Chart.yaml b/helm/passbook/Chart.yaml index fabd896b8..ac6b6eb5e 100644 --- a/helm/passbook/Chart.yaml +++ b/helm/passbook/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "0.2.6-beta" +appVersion: "0.2.7-beta" description: A Helm chart for passbook. name: passbook -version: "0.2.6-beta" +version: "0.2.7-beta" icon: https://git.beryju.org/uploads/-/system/project/avatar/108/logo.png diff --git a/helm/passbook/values.yaml b/helm/passbook/values.yaml index b5cce0047..03855953a 100644 --- a/helm/passbook/values.yaml +++ b/helm/passbook/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - tag: 0.2.6-beta + tag: 0.2.7-beta nameOverride: "" diff --git a/passbook/__init__.py b/passbook/__init__.py index f8a14861c..4bb8a05ec 100644 --- a/passbook/__init__.py +++ b/passbook/__init__.py @@ -1,2 +1,2 @@ """passbook""" -__version__ = '0.2.6-beta' +__version__ = '0.2.7-beta' diff --git a/passbook/core/nginx.conf b/passbook/core/nginx.conf index c3500b5de..3228264a0 100644 --- a/passbook/core/nginx.conf +++ b/passbook/core/nginx.conf @@ -39,7 +39,7 @@ http { gzip on; gzip_types application/javascript image/* text/css; gunzip on; - add_header X-passbook-Version 0.2.6-beta; + add_header X-passbook-Version 0.2.7-beta; add_header Vary X-passbook-Version; root /static/;