...
 
Commits (2)
[bumpversion]
current_version = 0.7.6
current_version = 0.8.0rc1
tag = True
commit = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-?)(?P<release>.*)
......@@ -9,13 +9,11 @@ serialize =
message = new release: {new_version}
tag_name = version/{new_version}
[bumpversion:file:install/helm/p2/Chart.yaml]
[bumpversion:file:operator/helm-charts/p2/Chart.yaml]
[bumpversion:file:install/helm/p2/values.yaml]
[bumpversion:file:operator/helm-charts/p2/values.yaml]
[bumpversion:file:install/k3s-helm.yaml]
[bumpversion:file:install/install.sh]
[bumpversion:file:deploy/install.sh]
[bumpversion:file:p2/__init__.py]
......
......@@ -30,7 +30,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/p2/base:latest --destination docker.beryju.org/p2/base:0.7.6
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.base --destination docker.beryju.org/p2/base:latest --destination docker.beryju.org/p2/base:0.8.0-rc1
stage: build-base-image
only:
refs:
......@@ -44,7 +44,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/p2/dev:latest --destination docker.beryju.org/p2/dev:0.7.6
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.dev --destination docker.beryju.org/p2/dev:latest --destination docker.beryju.org/p2/dev:0.8.0-rc1
stage: build-dev-image
only:
refs:
......@@ -114,7 +114,7 @@ build-p2-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/p2/server:latest --destination docker.beryju.org/p2/server:0.7.6
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.beryju.org/p2/server:latest --destination docker.beryju.org/p2/server:0.8.0-rc1
only:
- tags
- /^version/.*$/
......@@ -126,7 +126,7 @@ build-p2-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/p2/static:latest --destination docker.beryju.org/p2/static:0.7.6
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.static --destination docker.beryju.org/p2/static:latest --destination docker.beryju.org/p2/static:0.8.0-rc1
only:
- tags
- /^version/.*$/
......@@ -142,7 +142,7 @@ build-p2-tier0:
before_script:
- echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
script:
- /kaniko/executor --context $CI_PROJECT_DIR/tier0 --dockerfile $CI_PROJECT_DIR/tier0/Dockerfile --destination docker.beryju.org/p2/tier0:latest --destination docker.beryju.org/p2/tier0:0.7.6
- /kaniko/executor --context $CI_PROJECT_DIR/tier0 --dockerfile $CI_PROJECT_DIR/tier0/Dockerfile --destination docker.beryju.org/p2/tier0:latest --destination docker.beryju.org/p2/tier0:0.8.0-rc1
only:
- tags
- /^version/.*$/
......@@ -154,7 +154,7 @@ build-p2-operator:
before_script:
- echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
script:
- /kaniko/executor --context $CI_PROJECT_DIR/operator --dockerfile $CI_PROJECT_DIR/operator/build/Dockerfile --destination docker.beryju.org/p2/operator:latest --destination docker.beryju.org/p2/operator:0.7.6
- /kaniko/executor --context $CI_PROJECT_DIR/operator --dockerfile $CI_PROJECT_DIR/operator/build/Dockerfile --destination docker.beryju.org/p2/operator:latest --destination docker.beryju.org/p2/operator:0.8.0-rc1
only:
- tags
- /^version/.*$/
......@@ -3,9 +3,7 @@
# p2 Install script
# Installs and updates a p2 instance using k3s and docker
K3S_VERSION="0.6.1"
P2_VERSION="0.7.6"
export INSTALL_K3S_EXEC="--docker"
P2_VERSION="0.8.0-rc1"
if [ "$EUID" -ne 0 ]; then
echo "Please run as root"
......@@ -56,7 +54,7 @@ function __wait_until_pods_ready() {
curl -fsSL https://get.docker.com -o install.docker.sh
bash install.docker.sh > /dev/null 2>&1
# Make sure K3s is installed
curl -fsSL "https://raw.githubusercontent.com/rancher/k3s/v${K3S_VERSION}/install.sh" -o install.k3s.sh
curl -sfL https://get.k3s.io -o install.k3s.sh
bash install.k3s.sh > /dev/null 2>&1
STORAGE_BASE="${STORAGE_BASE:-/srv/p2}"
......
apiVersion: v1
appVersion: 0.7.6
appVersion: 0.8.0-rc1
description: A Helm chart for p2.
icon: https://p2.beryju.org/images/logo.png
icon: https://git.beryju.org/uploads/-/system/project/avatar/111/icon_2x.png
name: p2
version: 0.7.6
version: 0.8.0-rc1
version: 0.7.6
version: 0.8.0-rc1
# Replace this with your own secret_key (used to sign cookies and others)
secret_key: "y(qs_&z!7u+!7rq6z3fx=p)pfx_ah3l(i&#p(dx5cu=d3=knq3"
......
"""p2 version header"""
__version__ = '0.7.6'
__version__ = '0.8.0-rc1'
......@@ -39,7 +39,7 @@ http {
gzip on;
gzip_types application/javascript image/* text/css;
gunzip on;
add_header X-p2-Version 0.7.6;
add_header X-p2-Version 0.8.0-rc1;
add_header Vary X-p2-Version;
root /static/;
......
package internal
const Version = "0.7.6"
const Version = "0.8.0-rc1"