Compare commits

...

5 Commits

9 changed files with 33 additions and 22 deletions

View File

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.10.0-rc4 current_version = 0.10.0-rc6
tag = True tag = True
commit = True commit = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*) parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*)

View File

@ -1,6 +1,8 @@
name: passbook-release name: passbook-on-release
on: on:
release release:
types: [published, created]
jobs: jobs:
# Build # Build
@ -16,17 +18,26 @@ jobs:
- name: Building Docker Image - name: Building Docker Image
run: docker build run: docker build
--no-cache --no-cache
-t beryju/passbook:0.10.0-rc4 -t beryju/passbook:0.10.0-rc6
-t beryju/passbook:latest -t beryju/passbook:latest
-f Dockerfile . -f Dockerfile .
- name: Push Docker Container to Registry (versioned) - name: Push Docker Container to Registry (versioned)
run: docker push beryju/passbook:0.10.0-rc4 run: docker push beryju/passbook:0.10.0-rc6
- name: Push Docker Container to Registry (latest) - name: Push Docker Container to Registry (latest)
run: docker push beryju/passbook:latest run: docker push beryju/passbook:latest
build-proxy: build-proxy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: actions/setup-go@v2
with:
go-version: "^1.15"
- name: prepare go api client
run: |
cd proxy
go get -u github.com/go-swagger/go-swagger/cmd/swagger
swagger generate client -f ../swagger.yaml -A passbook -t pkg/
go build -v .
- name: Docker Login Registry - name: Docker Login Registry
env: env:
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@ -37,11 +48,11 @@ jobs:
cd proxy cd proxy
docker build \ docker build \
--no-cache \ --no-cache \
-t beryju/passbook-proxy:0.10.0-rc4 \ -t beryju/passbook-proxy:0.10.0-rc6 \
-t beryju/passbook-proxy:latest \ -t beryju/passbook-proxy:latest \
-f Dockerfile . -f Dockerfile .
- name: Push Docker Container to Registry (versioned) - name: Push Docker Container to Registry (versioned)
run: docker push beryju/passbook-proxy:0.10.0-rc4 run: docker push beryju/passbook-proxy:0.10.0-rc6
- name: Push Docker Container to Registry (latest) - name: Push Docker Container to Registry (latest)
run: docker push beryju/passbook-proxy:latest run: docker push beryju/passbook-proxy:latest
build-static: build-static:
@ -66,11 +77,11 @@ jobs:
run: docker build run: docker build
--no-cache --no-cache
--network=$(docker network ls | grep github | awk '{print $1}') --network=$(docker network ls | grep github | awk '{print $1}')
-t beryju/passbook-static:0.10.0-rc4 -t beryju/passbook-static:0.10.0-rc6
-t beryju/passbook-static:latest -t beryju/passbook-static:latest
-f static.Dockerfile . -f static.Dockerfile .
- name: Push Docker Container to Registry (versioned) - name: Push Docker Container to Registry (versioned)
run: docker push beryju/passbook-static:0.10.0-rc4 run: docker push beryju/passbook-static:0.10.0-rc6
- name: Push Docker Container to Registry (latest) - name: Push Docker Container to Registry (latest)
run: docker push beryju/passbook-static:latest run: docker push beryju/passbook-static:latest
test-release: test-release:
@ -85,7 +96,7 @@ jobs:
docker-compose pull -q docker-compose pull -q
docker-compose up --no-start docker-compose up --no-start
docker-compose start postgresql redis docker-compose start postgresql redis
docker-compose run -u root server bash -c "pip install --no-cache -r requirements-dev.txt && ./manage.py test" docker-compose run -u root --entrypoint /bin/bash server -c "pip install --no-cache -r requirements-dev.txt && ./manage.py test"
sentry-release: sentry-release:
needs: needs:
- test-release - test-release
@ -100,5 +111,5 @@ jobs:
SENTRY_PROJECT: passbook SENTRY_PROJECT: passbook
SENTRY_URL: https://sentry.beryju.org SENTRY_URL: https://sentry.beryju.org
with: with:
tagName: 0.10.0-rc4 tagName: 0.10.0-rc6
environment: beryjuorg-prod environment: beryjuorg-prod

View File

@ -1,10 +1,10 @@
name: passbook-on-tag
on: on:
push: push:
tags: tags:
- 'version/*' - 'version/*'
name: passbook-version-tag
jobs: jobs:
build: build:
name: Create Release from Tag name: Create Release from Tag

View File

@ -20,7 +20,7 @@ wget https://raw.githubusercontent.com/BeryJu/passbook/master/docker-compose.yml
# Optionally enable Error-reporting # Optionally enable Error-reporting
# export PASSBOOK_ERROR_REPORTING=true # export PASSBOOK_ERROR_REPORTING=true
# Optionally deploy a different version # Optionally deploy a different version
# export PASSBOOK_TAG=0.10.0-rc4 # export PASSBOOK_TAG=0.10.0-rc6
# If this is a productive installation, set a different PostgreSQL Password # If this is a productive installation, set a different PostgreSQL Password
# export PG_PASS=$(pwgen 40 1) # export PG_PASS=$(pwgen 40 1)
docker-compose pull docker-compose pull

View File

@ -21,7 +21,7 @@ services:
labels: labels:
- traefik.enable=false - traefik.enable=false
server: server:
image: beryju/passbook:${PASSBOOK_TAG:-0.10.0-rc4} image: beryju/passbook:${PASSBOOK_TAG:-0.10.0-rc6}
command: server command: server
environment: environment:
PASSBOOK_REDIS__HOST: redis PASSBOOK_REDIS__HOST: redis
@ -38,7 +38,7 @@ services:
- traefik.docker.network=internal - traefik.docker.network=internal
- traefik.frontend.rule=PathPrefix:/ - traefik.frontend.rule=PathPrefix:/
worker: worker:
image: beryju/passbook:${PASSBOOK_TAG:-0.10.0-rc4} image: beryju/passbook:${PASSBOOK_TAG:-0.10.0-rc6}
command: worker command: worker
networks: networks:
- internal - internal
@ -51,7 +51,7 @@ services:
PASSBOOK_POSTGRESQL__PASSWORD: ${PG_PASS:-thisisnotagoodpassword} PASSBOOK_POSTGRESQL__PASSWORD: ${PG_PASS:-thisisnotagoodpassword}
PASSBOOK_LOG_LEVEL: debug PASSBOOK_LOG_LEVEL: debug
static: static:
image: beryju/passbook-static:${PASSBOOK_TAG:-0.10.0-rc4} image: beryju/passbook-static:${PASSBOOK_TAG:-0.10.0-rc6}
networks: networks:
- internal - internal
labels: labels:

View File

@ -16,7 +16,7 @@ wget https://raw.githubusercontent.com/BeryJu/passbook/master/docker-compose.yml
# Optionally enable Error-reporting # Optionally enable Error-reporting
# export PASSBOOK_ERROR_REPORTING=true # export PASSBOOK_ERROR_REPORTING=true
# Optionally deploy a different version # Optionally deploy a different version
# export PASSBOOK_TAG=0.10.0-rc4 # export PASSBOOK_TAG=0.10.0-rc6
# If this is a productive installation, set a different PostgreSQL Password # If this is a productive installation, set a different PostgreSQL Password
# export PG_PASS=$(pwgen 40 1) # export PG_PASS=$(pwgen 40 1)
docker-compose pull docker-compose pull

View File

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: "0.10.0-rc4" appVersion: "0.10.0-rc6"
description: A Helm chart for passbook. description: A Helm chart for passbook.
name: passbook name: passbook
version: "0.10.0-rc4" version: "0.10.0-rc6"
icon: https://github.com/BeryJu/passbook/blob/master/passbook/static/static/passbook/logo.svg icon: https://github.com/BeryJu/passbook/blob/master/passbook/static/static/passbook/logo.svg
dependencies: dependencies:
- name: postgresql - name: postgresql

View File

@ -4,7 +4,7 @@
image: image:
name: beryju/passbook name: beryju/passbook
name_static: beryju/passbook-static name_static: beryju/passbook-static
tag: 0.10.0-rc4 tag: 0.10.0-rc6
nameOverride: "" nameOverride: ""

View File

@ -1,2 +1,2 @@
"""passbook""" """passbook"""
__version__ = "0.10.0-rc4" __version__ = "0.10.0-rc6"