Merge branch 'dev' into feature/19-runner_certficates

# Conflicts:
#	index.html
This commit is contained in:
Nicolai Ort 2021-04-03 18:50:16 +02:00
commit a554a90e74
3 changed files with 149 additions and 134 deletions

View File

@ -1,134 +1,134 @@
--- ---
kind: secret kind: secret
name: docker_username name: docker_username
get: get:
path: odit-registry-builder path: odit-registry-builder
name: username name: username
--- ---
kind: secret kind: secret
name: docker_password name: docker_password
get: get:
path: odit-registry-builder path: odit-registry-builder
name: password name: password
--- ---
kind: secret kind: secret
name: git_ssh name: git_ssh
get: get:
path: odit-git-bot path: odit-git-bot
name: sshkey name: sshkey
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: build:dev name: build:dev
steps: steps:
# - name: run full license export # - name: run full license export
# depends_on: ["clone"] # depends_on: ["clone"]
# image: node:alpine # image: node:alpine
# commands: # commands:
# - yarn # - yarn
# - yarn licenses:export # - yarn licenses:export
# - name: push new licenses file to repo # - name: push new licenses file to repo
# depends_on: ["run full license export"] # depends_on: ["run full license export"]
# image: appleboy/drone-git-push # image: appleboy/drone-git-push
# settings: # settings:
# branch: dev # branch: dev
# commit: true # commit: true
# commit_message: new license file version [CI SKIP] # commit_message: new license file version [CI SKIP]
# author_email: bot@odit.services # author_email: bot@odit.services
# remote: git@git.odit.services:lfk/selfservice.git # remote: git@git.odit.services:lfk/selfservice.git
# ssh_key: # ssh_key:
# from_secret: git_ssh # from_secret: git_ssh
- name: build dev - name: build dev
image: plugins/docker image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice repo: registry.odit.services/lfk/selfservice
tags: tags:
- dev - dev
registry: registry.odit.services registry: registry.odit.services
mtu: 1000 mtu: 1000
trigger: trigger:
branch: branch:
- dev - dev
event: event:
- push - push
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: build:testing name: build:testing
steps: steps:
- name: build testing - name: build testing
image: plugins/docker image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice repo: registry.odit.services/lfk/selfservice
tags: tags:
- testing - testing
registry: registry.odit.services registry: registry.odit.services
mtu: 1000 mtu: 1000
trigger: trigger:
branch: branch:
- bugfix/31-env_linking - bugfix/31-env_linking
event: event:
- push - push
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: build:latest name: build:latest
steps: steps:
- name: build latest - name: build latest
image: plugins/docker image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice repo: registry.odit.services/lfk/selfservice
tags: tags:
- latest - latest
registry: registry.odit.services registry: registry.odit.services
mtu: 1000 mtu: 1000
trigger: trigger:
branch: branch:
- main - main
event: event:
- push - push
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: build:tags name: build:tags
steps: steps:
- name: build $DRONE_TAG - name: build $DRONE_TAG
image: plugins/docker image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice repo: registry.odit.services/lfk/selfservice
tags: tags:
- '${DRONE_TAG}' - '${DRONE_TAG}'
registry: registry.odit.services registry: registry.odit.services
mtu: 1000 mtu: 1000
trigger: trigger:
event: event:
- tag - tag

View File

@ -2,8 +2,23 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [0.5.1](https://git.odit.services/lfk/selfservice/compare/0.5.0...0.5.1)
- Merge pull request 'feature/30-profile-forgot-link' (#35) from feature/30-profile-forgot-link into dev [`#30`](https://git.odit.services/lfk/selfservice/issues/30)
- Merge pull request 'Env linking bugfix bugfix/31-env_linking' (#37) from bugfix/31-env_linking into dev [`fd6bd88`](https://git.odit.services/lfk/selfservice/commit/fd6bd88d4238cca2a2755ab1bc51ff7870bef947)
- basic ProfileNone layout [`863568d`](https://git.odit.services/lfk/selfservice/commit/863568d7d0e132dd1b7d13a2cb1afe8db02c472c)
- add forgot view + action [`30f3a51`](https://git.odit.services/lfk/selfservice/commit/30f3a51ef82ad966225abc6fd95508af56106924)
- Added building pipeline for current branch [`544542a`](https://git.odit.services/lfk/selfservice/commit/544542ac1e9717506676c1495c2d530eca833d31)
- Removed useless code [`713db5e`](https://git.odit.services/lfk/selfservice/commit/713db5e1e8fed5f38b3a5d19cfe870eff16eeda1)
- Now manually linking env and main [`67c0dae`](https://git.odit.services/lfk/selfservice/commit/67c0dae537df5842e89c0ed040c0fef02df01b69)
- Fixed post url and body [`0795ea3`](https://git.odit.services/lfk/selfservice/commit/0795ea318d80b764eee89462ad87da86aa7ce0ae)
- 🐞 fix home routes [`60dea51`](https://git.odit.services/lfk/selfservice/commit/60dea511b9fbb6d206ee531618e788e686fa6b5a)
#### [0.5.0](https://git.odit.services/lfk/selfservice/compare/0.4.5...0.5.0) #### [0.5.0](https://git.odit.services/lfk/selfservice/compare/0.4.5...0.5.0)
> 1 April 2021
- 🚀Bumped version to v0.5.0 [`676f0e8`](https://git.odit.services/lfk/selfservice/commit/676f0e83393be823ccb612846650a9a98bf7f0b3)
- Revert "🚀Bumped version to v0.5.0" [`27fd8f9`](https://git.odit.services/lfk/selfservice/commit/27fd8f9a9106294ae6522f2fff42dfbf84f06f82) - Revert "🚀Bumped version to v0.5.0" [`27fd8f9`](https://git.odit.services/lfk/selfservice/commit/27fd8f9a9106294ae6522f2fff42dfbf84f06f82)
- 🚀Bumped version to v0.5.0 [`b8c1b8c`](https://git.odit.services/lfk/selfservice/commit/b8c1b8c43b6d050d239d836bbb6ace2504fdcd21) - 🚀Bumped version to v0.5.0 [`b8c1b8c`](https://git.odit.services/lfk/selfservice/commit/b8c1b8c43b6d050d239d836bbb6ace2504fdcd21)
- Merge pull request 'Runner self deletion feature/21-user_deletion' (#36) from feature/21-user_deletion into dev [`bd512e0`](https://git.odit.services/lfk/selfservice/commit/bd512e0651363f1f2543136d354d9ada9990d83d) - Merge pull request 'Runner self deletion feature/21-user_deletion' (#36) from feature/21-user_deletion into dev [`bd512e0`](https://git.odit.services/lfk/selfservice/commit/bd512e0651363f1f2543136d354d9ada9990d83d)

View File

@ -1,6 +1,6 @@
{ {
"name": "@odit/lfk-selfservice", "name": "@odit/lfk-selfservice",
"version": "0.5.0", "version": "0.5.1",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",