Compare commits

...

3 Commits

17 changed files with 31 additions and 17 deletions

View File

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

2
.gitignore vendored
View File

@ -189,5 +189,5 @@ pyvenv.cfg
pip-selfcheck.json
# End of https://www.gitignore.io/api/python,django
/static/*
static/
local.env.yml

View File

@ -46,7 +46,7 @@ package-docker:
before_script:
- echo "{\"auths\":{\"https://docker.$NEXUS_URL/\":{\"username\":\"$NEXUS_USER\",\"password\":\"$NEXUS_PASS\"}}}" > /kaniko/.docker/config.json
script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.0.4-alpha
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.0.5-alpha
stage: build
only:
- tags
@ -55,6 +55,7 @@ package-helm:
stage: build
script:
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
- helm init --client-only
- helm package helm/passbook
- ./manage.py nexus_upload --method put --url $NEXUS_URL --user $NEXUS_USER --password $NEXUS_PASS --repo helm *.tgz
only:

View File

@ -1,10 +1,23 @@
FROM python:3.6-slim-stretch as build
COPY ./passbook/ /app/passbook
COPY ./manage.py /app/
COPY ./requirements.txt /app/
WORKDIR /source/
RUN mkdir /app/static/ && \
pip install -r requirements.txt && \
pip install psycopg2 && \
./manage.py collectstatic --no-input
FROM python:3.6-slim-stretch
# LABEL version="1.8.8"
COPY ./passbook/ /app/passbook
COPY ./static/ /app/static
COPY ./manage.py /app/
COPY ./requirements.txt /app/
COPY --from=build /app/static/* /app/static/
WORKDIR /app/

View File

@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "0.0.4-alpha"
appVersion: "0.0.5-alpha"
description: A Helm chart for passbook.
name: passbook
version: 1.0.0

View File

@ -1,2 +1,2 @@
"""passbook"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook admin"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook api"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook audit Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook captcha_factor Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook core"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""Passbook ldap app Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook lib"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook oauth_client Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook oauth_provider Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook saml_idp Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'

View File

@ -1,2 +1,2 @@
"""passbook totp Header"""
__version__ = '0.0.4-alpha'
__version__ = '0.0.5-alpha'