Compare commits
3 Commits
version/0.
...
version/0.
Author | SHA1 | Date | |
---|---|---|---|
a9d29067bf | |||
b7791f3b9a | |||
9161a6e41d |
@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 0.0.4-alpha
|
current_version = 0.0.5-alpha
|
||||||
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>.*)
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -189,5 +189,5 @@ pyvenv.cfg
|
|||||||
pip-selfcheck.json
|
pip-selfcheck.json
|
||||||
|
|
||||||
# End of https://www.gitignore.io/api/python,django
|
# End of https://www.gitignore.io/api/python,django
|
||||||
/static/*
|
static/
|
||||||
local.env.yml
|
local.env.yml
|
||||||
|
@ -46,7 +46,7 @@ package-docker:
|
|||||||
before_script:
|
before_script:
|
||||||
- echo "{\"auths\":{\"https://docker.$NEXUS_URL/\":{\"username\":\"$NEXUS_USER\",\"password\":\"$NEXUS_PASS\"}}}" > /kaniko/.docker/config.json
|
- echo "{\"auths\":{\"https://docker.$NEXUS_URL/\":{\"username\":\"$NEXUS_USER\",\"password\":\"$NEXUS_PASS\"}}}" > /kaniko/.docker/config.json
|
||||||
script:
|
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
|
stage: build
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
@ -55,6 +55,7 @@ package-helm:
|
|||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
|
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
|
||||||
|
- helm init --client-only
|
||||||
- helm package helm/passbook
|
- helm package helm/passbook
|
||||||
- ./manage.py nexus_upload --method put --url $NEXUS_URL --user $NEXUS_USER --password $NEXUS_PASS --repo helm *.tgz
|
- ./manage.py nexus_upload --method put --url $NEXUS_URL --user $NEXUS_USER --password $NEXUS_PASS --repo helm *.tgz
|
||||||
only:
|
only:
|
||||||
|
15
Dockerfile
15
Dockerfile
@ -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
|
FROM python:3.6-slim-stretch
|
||||||
# LABEL version="1.8.8"
|
# LABEL version="1.8.8"
|
||||||
|
|
||||||
COPY ./passbook/ /app/passbook
|
COPY ./passbook/ /app/passbook
|
||||||
COPY ./static/ /app/static
|
|
||||||
COPY ./manage.py /app/
|
COPY ./manage.py /app/
|
||||||
COPY ./requirements.txt /app/
|
COPY ./requirements.txt /app/
|
||||||
|
COPY --from=build /app/static/* /app/static/
|
||||||
|
|
||||||
WORKDIR /app/
|
WORKDIR /app/
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
appVersion: "0.0.4-alpha"
|
appVersion: "0.0.5-alpha"
|
||||||
description: A Helm chart for passbook.
|
description: A Helm chart for passbook.
|
||||||
name: passbook
|
name: passbook
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook"""
|
"""passbook"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook admin"""
|
"""passbook admin"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook api"""
|
"""passbook api"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook audit Header"""
|
"""passbook audit Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook captcha_factor Header"""
|
"""passbook captcha_factor Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook core"""
|
"""passbook core"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""Passbook ldap app Header"""
|
"""Passbook ldap app Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook lib"""
|
"""passbook lib"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook oauth_client Header"""
|
"""passbook oauth_client Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook oauth_provider Header"""
|
"""passbook oauth_provider Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook saml_idp Header"""
|
"""passbook saml_idp Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
"""passbook totp Header"""
|
"""passbook totp Header"""
|
||||||
__version__ = '0.0.4-alpha'
|
__version__ = '0.0.5-alpha'
|
||||||
|
Reference in New Issue
Block a user