14 Commits

Author SHA1 Message Date
84e3778b89 🚀Bumped version to v0.2.0
Some checks failed
continuous-integration/drone/push Build is failing
2023-02-01 17:53:01 +01:00
4ca5f9d38d Merge pull request 'feature/kaniko' (#18) from feature/kaniko into dev
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #18
2023-02-01 14:00:47 +00:00
0692b72955 Bumped used ci node images
All checks were successful
continuous-integration/drone/pr Build is passing
2023-02-01 13:37:48 +01:00
c48a2ed01e Fresh licenses 4 yall 2023-02-01 13:36:23 +01:00
f422f989c7 Now building w/ kaniko 2023-02-01 13:35:51 +01:00
af173dcec8 Bumped docker node 2023-02-01 13:32:55 +01:00
acb013e8ae Shut up pnpm warnings 2023-02-01 13:31:31 +01:00
22470d6160 Version pinning 2023-02-01 13:31:20 +01:00
e155454013 🧾New changelog file version [CI SKIP] [skip ci] 2023-02-01 12:27:34 +00:00
07306be497 Merge pull request 'update runner-welcome mail template' (#17) from dev into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #17
Reviewed-by: Nicolai Ort <info@nicolai-ort.com>
2023-02-01 12:27:19 +00:00
247d4b6176 📖New license file version [CI SKIP] [skip ci]
Some checks failed
continuous-integration/drone/pr Build is failing
2023-01-31 13:01:06 +00:00
00bb40ddf9 🧾New changelog file version [CI SKIP] [skip ci]
Some checks failed
continuous-integration/drone/pr Build is failing
2023-01-31 13:00:29 +00:00
809df9c4ac update runner-welcome mail template
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing
close #15
2023-01-31 13:59:11 +01:00
e713ef54ef 🧾New changelog file version [CI SKIP] [skip ci] 2021-04-15 18:04:19 +00:00
7 changed files with 95 additions and 72 deletions

View File

@@ -22,7 +22,7 @@ get:
---
kind: pipeline
type: kubernetes
name: tests:node_latest
name: tests:node
clone:
disable: true
steps:
@@ -32,7 +32,7 @@ steps:
- git clone $DRONE_REMOTE_URL .
- git checkout $DRONE_SOURCE_BRANCH
- name: run tests
image: node:latest
image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
commands:
- yarn
- yarn test:ci
@@ -54,21 +54,25 @@ steps:
- git clone $DRONE_REMOTE_URL .
- git checkout dev
- name: build dev
image: plugins/docker
depends_on: [clone]
image: registry.odit.services/library/drone-kaniko
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: registry.odit.services/lfk/mailer
build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/mailer
tags:
- dev
cache: true
registry: registry.odit.services
mtu: 1000
- name: run changelog export
depends_on: ["clone"]
image: node:latest
image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
commands:
- npx auto-changelog --commit-limit false -p -u --hide-credit
- name: push new changelog to repo
@@ -84,7 +88,7 @@ steps:
from_secret: git_ssh
- name: run full license export
depends_on: ["clone"]
image: node:14.15.1-alpine3.12
image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
commands:
- yarn
- yarn licenses:export
@@ -100,7 +104,6 @@ steps:
skip_verify: true
ssh_key:
from_secret: git_ssh
trigger:
branch:
- dev
@@ -123,18 +126,22 @@ steps:
- git merge main
- git checkout main
- name: build latest
depends_on: ["clone"]
image: plugins/docker
image: registry.odit.services/library/drone-kaniko
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: registry.odit.services/lfk/mailer
build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/mailer
tags:
- latest
cache: true
registry: registry.odit.services
mtu: 1000
- name: push merge to repo
depends_on: ["clone"]
image: appleboy/drone-git-push
@@ -144,7 +151,6 @@ steps:
remote: git@git.odit.services:lfk/mailer.git
ssh_key:
from_secret: git_ssh
trigger:
branch:
- main
@@ -158,18 +164,22 @@ name: build:tags
steps:
- name: build $DRONE_TAG
image: plugins/docker
depends_on: [clone]
image: registry.odit.services/library/drone-kaniko
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: registry.odit.services/lfk/mailer
build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/mailer
tags:
- '${DRONE_TAG}'
- "${DRONE_TAG}"
cache: true
registry: registry.odit.services
mtu: 1000
trigger:
event:
- tag
- tag

1
.npmrc Normal file
View File

@@ -0,0 +1 @@
strict-peer-dependencies=false

View File

@@ -2,10 +2,22 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2)
- update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663)
- 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39)
- 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c)
- 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc)
#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2)
> 15 April 2021
- Merge pull request 'Release 0.1.2' (#14) from dev into main [`15b98e8`](https://git.odit.services/lfk/mailer/commit/15b98e83098906005e0f3f0b24313f9cab6ec1af)
- Fixed typos and added missing translations🌎 [`8099d2f`](https://git.odit.services/lfk/mailer/commit/8099d2fdbaa8fea6e4fd6a993ac1cfb09e01d14d)
- 🧾New changelog file version [CI SKIP] [skip ci] [`c8378b6`](https://git.odit.services/lfk/mailer/commit/c8378b66ba512a90ca4386d5a3570f4bb8bea049)
- 🧾New changelog file version [CI SKIP] [skip ci] [`fbc95be`](https://git.odit.services/lfk/mailer/commit/fbc95be3455eed0d97a124f7df277d0f902e76c9)
- 🚀Bumped version to v0.1.2 [`d550059`](https://git.odit.services/lfk/mailer/commit/d5500594945b99e428ac1651afd1fe8a8eeba192)
#### [v0.1.1](https://git.odit.services/lfk/mailer/compare/v0.1.0...v0.1.1)

View File

@@ -1,5 +1,5 @@
# Typescript Build
FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
WORKDIR /app
COPY package.json ./
RUN npm i -g pnpm
@@ -8,7 +8,7 @@ COPY tsconfig.json ./
COPY src ./src
RUN pnpm run build
# final image
FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
COPY package.json ./
RUN npm i -g pnpm
RUN pnpm i --prod

View File

@@ -494,7 +494,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
## License Text
MIT License
Copyright (c) Microsoft Corporation.
Copyright (c) Microsoft Corporation. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@@ -1,6 +1,6 @@
{
"name": "@odit/lfk-mailer",
"version": "0.1.2",
"version": "0.2.0",
"description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)",
"main": "src/app.ts",
"scripts": {
@@ -44,37 +44,37 @@
],
"license": "CC-BY-NC-SA-4.0",
"dependencies": {
"@odit/class-validator-jsonschema": "^2.1.1",
"@odit/class-validator-jsonschema": "2.1.1",
"class-transformer": "0.3.1",
"class-validator": "^0.13.1",
"consola": "^2.15.3",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"handlebars": "^4.7.6",
"i18next": "^19.8.7",
"i18next-fs-backend": "^1.0.8",
"nodemailer": "^6.5.0",
"reflect-metadata": "^0.1.13",
"class-validator": "0.13.1",
"consola": "2.15.3",
"cors": "2.8.5",
"dotenv": "8.2.0",
"express": "4.17.1",
"handlebars": "4.7.6",
"i18next": "19.8.7",
"i18next-fs-backend": "1.0.8",
"nodemailer": "6.5.0",
"reflect-metadata": "0.1.13",
"routing-controllers": "0.9.0-alpha.6",
"routing-controllers-openapi": "2.2.0"
},
"devDependencies": {
"@odit/license-exporter": "^0.0.10",
"@types/express": "^4.17.11",
"@types/jest": "^26.0.20",
"@types/node": "^14.14.22",
"@types/nodemailer": "^6.4.0",
"axios": "^0.21.1",
"cp-cli": "^2.0.0",
"jest": "^26.6.3",
"nodemon": "^2.0.7",
"release-it": "^14.2.2",
"rimraf": "^3.0.2",
"start-server-and-test": "^1.12.0",
"ts-jest": "^26.5.2",
"ts-node": "^9.1.1",
"typescript": "^4.1.3"
"@odit/license-exporter": "0.0.10",
"@types/express": "4.17.11",
"@types/jest": "26.0.20",
"@types/node": "14.14.22",
"@types/nodemailer": "6.4.0",
"axios": "0.21.1",
"cp-cli": "2.0.0",
"jest": "26.6.3",
"nodemon": "2.0.7",
"release-it": "14.2.2",
"rimraf": "3.0.2",
"start-server-and-test": "1.12.0",
"ts-jest": "26.5.2",
"ts-node": "9.1.1",
"typescript": "4.1.3"
},
"release-it": {
"git": {

View File

@@ -134,7 +134,7 @@ export class Mailer {
link_imprint: `${config.app_url}/imprint`,
link_privacy: `${config.app_url}/privacy`,
selfservice_link: `${config.app_url}/selfservice/profile/${token}`,
forgot_link: `${config.app_url}/selfservice`,
forgot_link: `${config.app_url}/selfservice/`,
contact_mail: config.contact_mail,
event_name: config.event_name
}
@@ -168,7 +168,7 @@ export class Mailer {
link_imprint: `${config.app_url}/imprint`,
link_privacy: `${config.app_url}/privacy`,
selfservice_link: `${config.app_url}/selfservice/profile/${token}`,
forgot_link: `${config.app_url}/selfservice`,
forgot_link: `${config.app_url}/selfservice/`,
contact_mail: config.contact_mail,
event_name: config.event_name
}