Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
a54cb287a4 | |||
74d334f9b7 | |||
cd3cd81360 | |||
cf48c00ddb | |||
3192365793 | |||
075d484f11 | |||
5082b1b8b1 | |||
50dd703a1b |
180
.drone.yml
180
.drone.yml
@ -1,180 +0,0 @@
|
|||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: docker_username
|
|
||||||
get:
|
|
||||||
path: odit-registry-builder
|
|
||||||
name: username
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: docker_password
|
|
||||||
get:
|
|
||||||
path: odit-registry-builder
|
|
||||||
name: password
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: git_ssh
|
|
||||||
get:
|
|
||||||
path: odit-git-bot
|
|
||||||
name: sshkey
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: ci_token
|
|
||||||
get:
|
|
||||||
path: odit-ci-bot
|
|
||||||
name: apikey
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: secret
|
|
||||||
name: npm_url
|
|
||||||
get:
|
|
||||||
path: odit-npm-cache
|
|
||||||
name: url
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: kubernetes
|
|
||||||
name: tests:node
|
|
||||||
clone:
|
|
||||||
disable: true
|
|
||||||
steps:
|
|
||||||
- name: checkout pr
|
|
||||||
image: alpine/git
|
|
||||||
commands:
|
|
||||||
- git clone $DRONE_REMOTE_URL .
|
|
||||||
- git checkout $DRONE_SOURCE_BRANCH
|
|
||||||
- name: run tests
|
|
||||||
image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
|
|
||||||
commands:
|
|
||||||
- npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
|
|
||||||
- pnpm i
|
|
||||||
- pnpm test:ci
|
|
||||||
environment:
|
|
||||||
NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- pull_request
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: kubernetes
|
|
||||||
name: build:dev
|
|
||||||
clone:
|
|
||||||
disable: true
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: clone
|
|
||||||
image: alpine/git
|
|
||||||
commands:
|
|
||||||
- git clone $DRONE_REMOTE_URL .
|
|
||||||
- git checkout dev
|
|
||||||
- name: build dev
|
|
||||||
depends_on: ["clone"]
|
|
||||||
image: registry.odit.services/library/drone-kaniko
|
|
||||||
settings:
|
|
||||||
username:
|
|
||||||
from_secret: docker_username
|
|
||||||
password:
|
|
||||||
from_secret: docker_password
|
|
||||||
build_args:
|
|
||||||
- NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
repo: lfk/backend
|
|
||||||
tags:
|
|
||||||
- dev
|
|
||||||
cache: true
|
|
||||||
registry: registry.odit.services
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
branch:
|
|
||||||
- dev
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: kubernetes
|
|
||||||
name: build:latest
|
|
||||||
clone:
|
|
||||||
disable: true
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: clone
|
|
||||||
image: alpine/git
|
|
||||||
commands:
|
|
||||||
- git clone $DRONE_REMOTE_URL .
|
|
||||||
- git checkout dev
|
|
||||||
- git merge main
|
|
||||||
- git checkout main
|
|
||||||
- name: build latest
|
|
||||||
depends_on: ["clone"]
|
|
||||||
image: registry.odit.services/library/drone-kaniko
|
|
||||||
settings:
|
|
||||||
username:
|
|
||||||
from_secret: docker_username
|
|
||||||
password:
|
|
||||||
from_secret: docker_password
|
|
||||||
build_args:
|
|
||||||
- NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
repo: lfk/backend
|
|
||||||
tags:
|
|
||||||
- latest
|
|
||||||
cache: true
|
|
||||||
registry: registry.odit.services
|
|
||||||
- name: push merge to repo
|
|
||||||
depends_on: ["clone"]
|
|
||||||
image: appleboy/drone-git-push
|
|
||||||
settings:
|
|
||||||
branch: dev
|
|
||||||
commit: false
|
|
||||||
remote: git@git.odit.services:lfk/backend.git
|
|
||||||
ssh_key:
|
|
||||||
from_secret: git_ssh
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
branch:
|
|
||||||
- main
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: kubernetes
|
|
||||||
name: build:tags
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: build $DRONE_TAG
|
|
||||||
depends_on: ["clone"]
|
|
||||||
image: registry.odit.services/library/drone-kaniko
|
|
||||||
settings:
|
|
||||||
username:
|
|
||||||
from_secret: docker_username
|
|
||||||
password:
|
|
||||||
from_secret: docker_password
|
|
||||||
build_args:
|
|
||||||
- NPM_REGISTRY_URL:
|
|
||||||
from_secret: npm_url
|
|
||||||
repo: lfk/backend
|
|
||||||
tags:
|
|
||||||
- "${DRONE_TAG}"
|
|
||||||
cache: true
|
|
||||||
registry: registry.odit.services
|
|
||||||
- name: trigger node lib build
|
|
||||||
image: idcooldi/drone-webhook
|
|
||||||
settings:
|
|
||||||
urls: https://ci.odit.services/api/repos/lfk/lfk-client-node/builds?SOURCE_TAG=${DRONE_TAG}
|
|
||||||
bearer:
|
|
||||||
from_secret: ci_token
|
|
||||||
- name: trigger js lib build
|
|
||||||
image: idcooldi/drone-webhook
|
|
||||||
settings:
|
|
||||||
urls: https://ci.odit.services/api/repos/lfk/lfk-client-js/builds?SOURCE_TAG=${DRONE_TAG}
|
|
||||||
bearer:
|
|
||||||
from_secret: ci_token
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- tag
|
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -136,4 +136,3 @@ build
|
|||||||
lib
|
lib
|
||||||
/oss-attribution
|
/oss-attribution
|
||||||
*.tmp
|
*.tmp
|
||||||
pnpm-lock.yaml
|
|
||||||
|
39
.woodpecker/build.yml
Normal file
39
.woodpecker/build.yml
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
steps:
|
||||||
|
- name: build latest
|
||||||
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
|
settings:
|
||||||
|
repo: registry.odit.services/lfk/backend
|
||||||
|
tags:
|
||||||
|
- latest
|
||||||
|
registry: registry.odit.services
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
cache_from: registry.odit.services/lfk/backend:latest
|
||||||
|
username:
|
||||||
|
from_secret: odit-registry-builder-username
|
||||||
|
password:
|
||||||
|
from_secret: odit-registry-builder-password
|
||||||
|
secrets:
|
||||||
|
- source: odit-npm-cache-url
|
||||||
|
target: NPM_REGISTRY_URL
|
||||||
|
when:
|
||||||
|
branch: main
|
||||||
|
- name: build dev
|
||||||
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
|
settings:
|
||||||
|
repo: registry.odit.services/lfk/backend
|
||||||
|
tags:
|
||||||
|
- dev
|
||||||
|
registry: registry.odit.services
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
cache_from: registry.odit.services/lfk/backend:dev
|
||||||
|
username:
|
||||||
|
from_secret: odit-registry-builder-username
|
||||||
|
password:
|
||||||
|
from_secret: odit-registry-builder-password
|
||||||
|
secrets:
|
||||||
|
- source: odit-npm-cache-url
|
||||||
|
target: NPM_REGISTRY_URL
|
||||||
|
when:
|
||||||
|
branch: dev
|
||||||
|
when:
|
||||||
|
event: push
|
29
.woodpecker/release.yml
Normal file
29
.woodpecker/release.yml
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
steps:
|
||||||
|
- name: build tag
|
||||||
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
|
settings:
|
||||||
|
repo: registry.odit.services/lfk/backend
|
||||||
|
tags:
|
||||||
|
- "${CI_COMMIT_TAG}"
|
||||||
|
registry: registry.odit.services
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
cache_from: registry.odit.services/lfk/backend:latest
|
||||||
|
username:
|
||||||
|
from_secret: odit-registry-builder-username
|
||||||
|
password:
|
||||||
|
from_secret: odit-registry-builder-password
|
||||||
|
secrets:
|
||||||
|
- source: odit-npm-cache-url
|
||||||
|
target: NPM_REGISTRY_URL
|
||||||
|
- name: trigger js lib build
|
||||||
|
image: woodpeckerci/plugin-trigger
|
||||||
|
settings:
|
||||||
|
repositories:
|
||||||
|
- lfk/lfk-client-js
|
||||||
|
params:
|
||||||
|
- "SOURCE_TAG=${CI_COMMIT_TAG}"
|
||||||
|
token:
|
||||||
|
from_secret: odit-ci-bot-apikey
|
||||||
|
|
||||||
|
when:
|
||||||
|
event: tag
|
13
.woodpecker/testpr.yml
Normal file
13
.woodpecker/testpr.yml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
steps:
|
||||||
|
- name: playwright tests
|
||||||
|
image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
|
||||||
|
commands:
|
||||||
|
- npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
|
||||||
|
- pnpm i
|
||||||
|
- pnpm test:ci
|
||||||
|
secrets:
|
||||||
|
- source: odit-npm-cache-url
|
||||||
|
target: NPM_REGISTRY_URL
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- pull_request
|
13
CHANGELOG.md
13
CHANGELOG.md
@ -2,8 +2,21 @@
|
|||||||
|
|
||||||
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.
|
||||||
|
|
||||||
|
#### [v1.1.4](https://git.odit.services/lfk/backend/compare/v1.1.3...v1.1.4)
|
||||||
|
|
||||||
|
- build: package lock [`50dd703`](https://git.odit.services/lfk/backend/commit/50dd703a1bd276a607cc10a087c7e90fd880847a)
|
||||||
|
- fix(deps): Bump sqlite3 [`cd3cd81`](https://git.odit.services/lfk/backend/commit/cd3cd81360777e8bc4d78e861354e58c8da79cc7)
|
||||||
|
- feat(ci)!: Switch to woodpecker [`3192365`](https://git.odit.services/lfk/backend/commit/3192365793fae59f2b89e3231db298654f0a28e9)
|
||||||
|
- fix(deps): Bumped argon2 to latest version for arm support [`cf48c00`](https://git.odit.services/lfk/backend/commit/cf48c00ddb2ac33263549876928db50ae152c12d)
|
||||||
|
- fix: updated README for pnpm, typos [`5082b1b`](https://git.odit.services/lfk/backend/commit/5082b1b8b1c0ae9e8ffa9c71c4d7923fd9223c87)
|
||||||
|
- ci: drop lfk-client-node [`075d484`](https://git.odit.services/lfk/backend/commit/075d484f1169bfc5c5b68cb9712116b0e270b471)
|
||||||
|
- fix(dependencies): Switch back to previous class-validator version to produce a working build [`74d334f`](https://git.odit.services/lfk/backend/commit/74d334f9b747a77115bd9b97729ef1120822e128)
|
||||||
|
|
||||||
#### [v1.1.3](https://git.odit.services/lfk/backend/compare/v1.1.2...v1.1.3)
|
#### [v1.1.3](https://git.odit.services/lfk/backend/compare/v1.1.2...v1.1.3)
|
||||||
|
|
||||||
|
> 10 May 2023
|
||||||
|
|
||||||
|
- 🚀Bumped version to v1.1.3 [`057a8ee`](https://git.odit.services/lfk/backend/commit/057a8ee699d08c0e4a80cb50a8820f819569c9ac)
|
||||||
- feat(orgs): Also resolve child-teams' distances and add them to org total [`8d94186`](https://git.odit.services/lfk/backend/commit/8d9418635d3e381c0f55a2521a3334ba497c169a)
|
- feat(orgs): Also resolve child-teams' distances and add them to org total [`8d94186`](https://git.odit.services/lfk/backend/commit/8d9418635d3e381c0f55a2521a3334ba497c169a)
|
||||||
- fix(orgs): Removed unused log [`f2832a2`](https://git.odit.services/lfk/backend/commit/f2832a2daecc7bc7bbee4d4fceeab8db194730cf)
|
- fix(orgs): Removed unused log [`f2832a2`](https://git.odit.services/lfk/backend/commit/f2832a2daecc7bc7bbee4d4fceeab8db194730cf)
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Typescript Build
|
# Typescript Build
|
||||||
FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as build
|
FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as build
|
||||||
ARG NPM_REGISTRY_URL=https://registry.npmjs.org
|
ARG NPM_REGISTRY_URL=https://registry.npmjs.org
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ RUN pnpm run build \
|
|||||||
&& pnpm i --production --prefer-offline
|
&& pnpm i --production --prefer-offline
|
||||||
|
|
||||||
# final image
|
# final image
|
||||||
FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as final
|
FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=build /app/package.json /app/package.json
|
COPY --from=build /app/package.json /app/package.json
|
||||||
COPY --from=build /app/ormconfig.js /app/ormconfig.js
|
COPY --from=build /app/ormconfig.js /app/ormconfig.js
|
||||||
|
16
README.md
16
README.md
@ -16,23 +16,23 @@ Backend Server
|
|||||||
1. Rename the .env.example file to .env (you can adjust app port and other settings, if needed)
|
1. Rename the .env.example file to .env (you can adjust app port and other settings, if needed)
|
||||||
2. Install Dependencies
|
2. Install Dependencies
|
||||||
```bash
|
```bash
|
||||||
yarn
|
pnpm i
|
||||||
```
|
```
|
||||||
3. Start the server
|
3. Start the server
|
||||||
```bash
|
```bash
|
||||||
yarn dev
|
pnpm dev
|
||||||
```
|
```
|
||||||
|
|
||||||
### Run Tests
|
### Run Tests
|
||||||
```bash
|
```bash
|
||||||
# Run tests once (server has to run)
|
# Run tests once (server has to run)
|
||||||
yarn test
|
pnpm test
|
||||||
|
|
||||||
# Run test in watch mode (reruns on change)
|
# Run test in watch mode (reruns on change)
|
||||||
yarn test:watch
|
pnpm test:watch
|
||||||
|
|
||||||
# Run test in ci mode (automaticly starts the dev server)
|
# Run test in ci mode (automaticly starts the dev server)
|
||||||
yarn test:ci
|
pnpm test:ci
|
||||||
```
|
```
|
||||||
|
|
||||||
### Use your own mail templates
|
### Use your own mail templates
|
||||||
@ -44,7 +44,7 @@ Currently the following templates exist:
|
|||||||
|
|
||||||
### Generate Docs
|
### Generate Docs
|
||||||
```bash
|
```bash
|
||||||
yarn docs
|
pnpm docs
|
||||||
```
|
```
|
||||||
|
|
||||||
## ENV Vars
|
## ENV Vars
|
||||||
@ -90,5 +90,5 @@ yarn docs
|
|||||||
* The dev tag of the docker image get's build from this
|
* The dev tag of the docker image get's build from this
|
||||||
* Only push minor changes to this branch!
|
* Only push minor changes to this branch!
|
||||||
* To merge a feature branch into this please create a pull request
|
* To merge a feature branch into this please create a pull request
|
||||||
* feature/xyz: Feature branches - nameing scheme: `feature/issueid-title`
|
* feature/xyz: Feature branches - naming scheme: `feature/issueid-title`
|
||||||
* bugfix/xyz: Branches for bugfixes - nameing scheme:`bugfix/issueid-title`
|
* bugfix/xyz: Branches for bugfixes - naming scheme:`bugfix/issueid-title`
|
12
package.json
12
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@odit/lfk-backend",
|
"name": "@odit/lfk-backend",
|
||||||
"version": "1.1.3",
|
"version": "1.1.4",
|
||||||
"main": "src/app.ts",
|
"main": "src/app.ts",
|
||||||
"repository": "https://git.odit.services/lfk/backend",
|
"repository": "https://git.odit.services/lfk/backend",
|
||||||
"engines": {
|
"engines": {
|
||||||
@ -26,12 +26,12 @@
|
|||||||
"license": "CC-BY-NC-SA-4.0",
|
"license": "CC-BY-NC-SA-4.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@odit/class-validator-jsonschema": "2.1.1",
|
"@odit/class-validator-jsonschema": "2.1.1",
|
||||||
"argon2": "0.27.1",
|
"argon2": "0.31.2",
|
||||||
"axios": "0.21.1",
|
"axios": "0.21.1",
|
||||||
"body-parser": "1.19.0",
|
"body-parser": "1.19.0",
|
||||||
"check-password-strength": "2.0.2",
|
"check-password-strength": "2.0.2",
|
||||||
"class-transformer": "0.3.1",
|
"class-transformer": "0.3.1",
|
||||||
"class-validator": "0.13.1",
|
"class-validator": "0.13.0",
|
||||||
"consola": "2.15.0",
|
"consola": "2.15.0",
|
||||||
"cookie": "0.4.1",
|
"cookie": "0.4.1",
|
||||||
"cookie-parser": "1.4.5",
|
"cookie-parser": "1.4.5",
|
||||||
@ -46,7 +46,7 @@
|
|||||||
"reflect-metadata": "0.1.13",
|
"reflect-metadata": "0.1.13",
|
||||||
"routing-controllers": "0.9.0-alpha.6",
|
"routing-controllers": "0.9.0-alpha.6",
|
||||||
"routing-controllers-openapi": "2.2.0",
|
"routing-controllers-openapi": "2.2.0",
|
||||||
"sqlite3": "5.0.0",
|
"sqlite3": "5.1.6",
|
||||||
"typeorm": "0.2.30",
|
"typeorm": "0.2.30",
|
||||||
"typeorm-routing-controllers-extensions": "0.2.0",
|
"typeorm-routing-controllers-extensions": "0.2.0",
|
||||||
"typeorm-seeding": "1.6.1",
|
"typeorm-seeding": "1.6.1",
|
||||||
@ -54,7 +54,7 @@
|
|||||||
"validator": "13.5.2"
|
"validator": "13.5.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@faker-js/faker": "^7.6.0",
|
"@faker-js/faker": "7.6.0",
|
||||||
"@odit/license-exporter": "0.0.9",
|
"@odit/license-exporter": "0.0.9",
|
||||||
"@types/cors": "2.8.9",
|
"@types/cors": "2.8.9",
|
||||||
"@types/csvtojson": "1.1.5",
|
"@types/csvtojson": "1.1.5",
|
||||||
@ -63,7 +63,7 @@
|
|||||||
"@types/jsonwebtoken": "8.5.0",
|
"@types/jsonwebtoken": "8.5.0",
|
||||||
"@types/node": "14.14.22",
|
"@types/node": "14.14.22",
|
||||||
"@types/uuid": "8.3.0",
|
"@types/uuid": "8.3.0",
|
||||||
"auto-changelog": "^2.4.0",
|
"auto-changelog": "2.4.0",
|
||||||
"cp-cli": "2.0.0",
|
"cp-cli": "2.0.0",
|
||||||
"jest": "26.6.3",
|
"jest": "26.6.3",
|
||||||
"nodemon": "2.0.7",
|
"nodemon": "2.0.7",
|
||||||
|
7744
pnpm-lock.yaml
generated
Normal file
7744
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@ import { PermissionAction } from '../models/enums/PermissionAction';
|
|||||||
import { PermissionTarget } from '../models/enums/PermissionTargets';
|
import { PermissionTarget } from '../models/enums/PermissionTargets';
|
||||||
/**
|
/**
|
||||||
* Seeds a admin group with a demo user into the database for initial setup and auto recovery.
|
* Seeds a admin group with a demo user into the database for initial setup and auto recovery.
|
||||||
* We know that the nameing isn't perfectly fitting. Feel free to change it.
|
* We know that the naming isn't perfectly fitting. Feel free to change it.
|
||||||
*/
|
*/
|
||||||
export default class SeedUsers implements Seeder {
|
export default class SeedUsers implements Seeder {
|
||||||
public async run(factory: Factory, connection: Connection): Promise<any> {
|
public async run(factory: Factory, connection: Connection): Promise<any> {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user