Compare commits

...
15 Commits
Author SHA1 Message Date
niggl 4c10e20b91 🚀Bumped version to v0.12.0
continuous-integration/drone/push Build is failing
2023-02-02 10:19:57 +01:00
niggl 9217421221 Enabled tag via release script 2023-02-02 10:19:30 +01:00
niggl 4570845b3e Pinned pnpm for builds 2023-02-02 10:18:08 +01:00
niggl 0e78951300 Drone -> Kaniko based builds 2023-02-02 10:15:46 +01:00
niggl 6ad56b3126 Drone images to odit registry 2023-02-02 10:13:04 +01:00
niggl d95c6d3365 Bumped container base images 2023-02-02 10:10:48 +01:00
niggl 1f2c8abb22 Ignore pnpm lock 2023-02-02 10:08:22 +01:00
niggl a6d5693ccd Pinned versions 2023-02-02 10:05:23 +01:00
niggl 31b258b4ce 🧾New changelog file version [CI SKIP] [skip ci] 2021-04-22 18:21:52 +00:00
niggl f19f2808d8 Merge pull request 'Release 0.11.1' (#196) from dev into main
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #196
Reviewed-by: Philipp Dormann <philipp@philippdormann.de>
2021-04-22 18:21:16 +00:00
niggl 3b9cd2e1bb 🧾New changelog file version [CI SKIP] [skip ci]
continuous-integration/drone/pr Build is passing
2021-04-22 17:59:02 +00:00
niggl 95320ca1bc 🚀Bumped version to v0.11.1
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is passing
2021-04-22 19:57:31 +02:00
niggl f2d127fc98 🧾New changelog file version [CI SKIP] [skip ci]
continuous-integration/drone/pr Build is passing
2021-04-22 17:53:09 +00:00
niggl eb526fb57f Added fix for the appended 2
continuous-integration/drone/push Build is passing
2021-04-22 19:52:32 +02:00
niggl 348fe52c42 🧾New changelog file version [CI SKIP] [skip ci] 2021-04-22 17:42:09 +00:00
6 changed files with 99 additions and 72 deletions
+30 -19
View File
@@ -29,7 +29,7 @@ get:
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: tests:node_14.15.1-alpine3.12 name: tests:node
clone: clone:
disable: true disable: true
steps: steps:
@@ -39,7 +39,7 @@ steps:
- git clone $DRONE_REMOTE_URL . - git clone $DRONE_REMOTE_URL .
- git checkout $DRONE_SOURCE_BRANCH - git checkout $DRONE_SOURCE_BRANCH
- name: run tests - name: run tests
image: node:14.15.1-alpine3.12 image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
commands: commands:
- yarn - yarn
- yarn test:ci - yarn test:ci
@@ -61,21 +61,25 @@ steps:
- git clone $DRONE_REMOTE_URL . - git clone $DRONE_REMOTE_URL .
- git checkout dev - git checkout dev
- name: build dev - name: build dev
image: plugins/docker image: registry.odit.services/library/drone-kaniko
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/backend build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/backend
tags: tags:
- dev - dev
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
- name: run changelog export - name: run changelog export
depends_on: ["clone"] depends_on: ["clone"]
image: node:latest image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
commands: commands:
- npx auto-changelog --commit-limit false -p -u --hide-credit - npx auto-changelog --commit-limit false -p -u --hide-credit
- name: push new changelog to repo - name: push new changelog to repo
@@ -91,7 +95,7 @@ steps:
from_secret: git_ssh from_secret: git_ssh
- name: run full license export - name: run full license export
depends_on: ["clone"] depends_on: ["clone"]
image: node:14.15.1-alpine3.12 image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
commands: commands:
- yarn - yarn
- yarn licenses:export - yarn licenses:export
@@ -108,7 +112,6 @@ steps:
ssh_key: ssh_key:
from_secret: git_ssh from_secret: git_ssh
trigger: trigger:
branch: branch:
- dev - dev
@@ -131,18 +134,22 @@ steps:
- git merge main - git merge main
- git checkout main - git checkout main
- name: build latest - name: build latest
depends_on: ["clone"] image: registry.odit.services/library/drone-kaniko
image: plugins/docker
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/backend build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/backend
tags: tags:
- latest - latest
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
- name: push merge to repo - name: push merge to repo
depends_on: ["clone"] depends_on: ["clone"]
image: appleboy/drone-git-push image: appleboy/drone-git-push
@@ -166,18 +173,22 @@ name: build:tags
steps: steps:
- name: build $DRONE_TAG - name: build $DRONE_TAG
image: plugins/docker image: registry.odit.services/library/drone-kaniko
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/backend build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/backend
tags: tags:
- '${DRONE_TAG}' - "${DRONE_TAG}"
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
- name: trigger node lib build - name: trigger node lib build
image: idcooldi/drone-webhook image: idcooldi/drone-webhook
settings: settings:
@@ -192,4 +203,4 @@ steps:
from_secret: ci_token from_secret: ci_token
trigger: trigger:
event: event:
- tag - tag
+2 -1
View File
@@ -135,4 +135,5 @@ build
/docs /docs
lib lib
/oss-attribution /oss-attribution
*.tmp *.tmp
pnpm-lock.yaml
+13
View File
@@ -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.
#### [v0.11.1](https://git.odit.services/lfk/backend/compare/v0.11.0...v0.11.1)
- Merge pull request 'Release 0.11.1' (#196) from dev into main [`f19f280`](https://git.odit.services/lfk/backend/commit/f19f2808d88414f1877c01f10996dac68b6f9617)
- 🧾New changelog file version [CI SKIP] [skip ci] [`2229cdf`](https://git.odit.services/lfk/backend/commit/2229cdf20db1a98f9f76a99fa9d3f463cdf6d804)
- 🧾New changelog file version [CI SKIP] [skip ci] [`348fe52`](https://git.odit.services/lfk/backend/commit/348fe52c42cfa32239b703041820f725e147154e)
- Now prefixing runnercards with 2 [`8a82e05`](https://git.odit.services/lfk/backend/commit/8a82e059b74ceabf43c9cbfe9c9b89ef6ce15a28)
- 🧾New changelog file version [CI SKIP] [skip ci] [`3b9cd2e`](https://git.odit.services/lfk/backend/commit/3b9cd2e1bbbe8e69c3883233a98f286d768c2b79)
- Added fix for the appended 2 [`eb526fb`](https://git.odit.services/lfk/backend/commit/eb526fb57faf631fd6e84af99af738ab1b3481c7)
- 🚀Bumped version to v0.11.1 [`95320ca`](https://git.odit.services/lfk/backend/commit/95320ca1bccc2886553accea6a428aadffda0a27)
- 🧾New changelog file version [CI SKIP] [skip ci] [`f2d127f`](https://git.odit.services/lfk/backend/commit/f2d127fc98d75ce658424624abd382c087737ca0)
#### [v0.11.0](https://git.odit.services/lfk/backend/compare/v0.10.2...v0.11.0) #### [v0.11.0](https://git.odit.services/lfk/backend/compare/v0.10.2...v0.11.0)
> 14 April 2021
- Merge pull request 'Release 0.11.0' (#195) from dev into main [`3220b19`](https://git.odit.services/lfk/backend/commit/3220b194d4c704835d6d106ec4d9d54a17a38b62) - Merge pull request 'Release 0.11.0' (#195) from dev into main [`3220b19`](https://git.odit.services/lfk/backend/commit/3220b194d4c704835d6d106ec4d9d54a17a38b62)
- Fixed spelling [`da266a8`](https://git.odit.services/lfk/backend/commit/da266a8dd68dbb575997ae343624982b690486ec) - Fixed spelling [`da266a8`](https://git.odit.services/lfk/backend/commit/da266a8dd68dbb575997ae343624982b690486ec)
- Updated tests [`01ed514`](https://git.odit.services/lfk/backend/commit/01ed51489eb92fff907d46a930ecf0b0eb5cad2b) - Updated tests [`01ed514`](https://git.odit.services/lfk/backend/commit/01ed51489eb92fff907d46a930ecf0b0eb5cad2b)
+6 -7
View File
@@ -1,16 +1,15 @@
# Typescript Build # Typescript Build
FROM node:14.15.1-alpine3.12 FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16
WORKDIR /app WORKDIR /app
COPY package.json ./ COPY package.json ./
RUN npm i -g pnpm RUN npx pnpm@7.26.3 i
RUN pnpm i
COPY tsconfig.json ormconfig.js ./ COPY tsconfig.json ormconfig.js ./
COPY src ./src COPY src ./src
RUN pnpm run build RUN npm run build
# final image # final image
FROM node:14.15.1-alpine3.12 FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16
COPY package.json ormconfig.js ./ COPY package.json ormconfig.js ./
RUN npm i -g pnpm RUN npx pnpm@7.26.3 i --prod
RUN pnpm i --prod
COPY --from=0 /app/dist dist COPY --from=0 /app/dist dist
ENTRYPOINT ["node", "dist/app.js"] ENTRYPOINT ["node", "dist/app.js"]
+46 -44
View File
@@ -1,6 +1,6 @@
{ {
"name": "@odit/lfk-backend", "name": "@odit/lfk-backend",
"version": "0.11.0", "version": "0.12.0",
"main": "src/app.ts", "main": "src/app.ts",
"repository": "https://git.odit.services/lfk/backend", "repository": "https://git.odit.services/lfk/backend",
"author": { "author": {
@@ -23,52 +23,52 @@
"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.27.1",
"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.1",
"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",
"cors": "^2.8.5", "cors": "2.8.5",
"csvtojson": "^2.0.10", "csvtojson": "2.0.10",
"dotenv": "^8.2.0", "dotenv": "8.2.0",
"express": "^4.17.1", "express": "4.17.1",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "8.5.1",
"libphonenumber-js": "^1.9.9", "libphonenumber-js": "1.9.9",
"mysql": "^2.18.1", "mysql": "2.18.1",
"pg": "^8.5.1", "pg": "8.5.1",
"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.0.0",
"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",
"uuid": "^8.3.2", "uuid": "8.3.2",
"validator": "^13.5.2" "validator": "13.5.2"
}, },
"devDependencies": { "devDependencies": {
"@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",
"@types/express": "^4.17.11", "@types/express": "4.17.11",
"@types/jest": "^26.0.20", "@types/jest": "26.0.20",
"@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",
"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",
"release-it": "^14.2.2", "release-it": "14.2.2",
"rimraf": "^3.0.2", "rimraf": "3.0.2",
"start-server-and-test": "^1.11.7", "start-server-and-test": "1.11.7",
"ts-jest": "^26.5.0", "ts-jest": "26.5.0",
"ts-node": "^9.1.1", "ts-node": "9.1.1",
"typedoc": "^0.20.19", "typedoc": "0.20.19",
"typescript": "^4.1.3" "typescript": "4.1.3"
}, },
"scripts": { "scripts": {
"dev": "nodemon src/app.ts", "dev": "nodemon src/app.ts",
@@ -90,8 +90,10 @@
"requireCleanWorkingDir": false, "requireCleanWorkingDir": false,
"commitMessage": "🚀Bumped version to v${version}", "commitMessage": "🚀Bumped version to v${version}",
"requireBranch": "dev", "requireBranch": "dev",
"push": false, "push": true,
"tag": false "tag": true,
"tagName": "v${version}",
"tagAnnotation": "v${version}"
}, },
"npm": { "npm": {
"publish": false "publish": false
+2 -1
View File
@@ -57,7 +57,8 @@ export class CreateTrackScan {
* @returns The runnerCard whom's id you provided. * @returns The runnerCard whom's id you provided.
*/ */
public async getCard(): Promise<RunnerCard> { public async getCard(): Promise<RunnerCard> {
const track = await getConnection().getRepository(RunnerCard).findOne({ id: this.card }, { relations: ["runner"] }); const id = this.card % 200000000000;
const track = await getConnection().getRepository(RunnerCard).findOne({ id: id }, { relations: ["runner"] });
if (!track) { if (!track) {
throw new RunnerCardNotFoundError(); throw new RunnerCardNotFoundError();
} }