Switched ci over to pnpm cache

Reviewed-on: #16
Reviewed-by: Nicolai Ort <info@nicolai-ort.com>

.drone.yml

@@ -14,10 +14,10 @@ get:
 
 ---
 kind: secret
-name: git_ssh
+name: npm_url
 get:
-  path: odit-git-bot
-  name: sshkey
+  path: odit-npm-cache
+  name: url
 
 ---
 kind: pipeline
@@ -34,8 +34,12 @@ steps:
   - name: run tests
     image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
     commands:
-      - yarn
-      - yarn test:ci
+      - 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
@@ -61,10 +65,8 @@ steps:
       password:
         from_secret: docker_password
       build_args:
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
       repo: lfk/mailer
       tags:
         - dev
@@ -84,13 +86,6 @@ 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
     image: registry.odit.services/library/drone-kaniko
     settings:
@@ -99,10 +94,8 @@ steps:
       password:
         from_secret: docker_password
       build_args:
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
       repo: lfk/mailer
       tags:
         - latest
@@ -128,10 +121,8 @@ steps:
       password:
         from_secret: docker_password
       build_args:
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
       repo: lfk/mailer
       tags:
         - "${DRONE_TAG}"

.gitignore

@@ -137,5 +137,4 @@ build
 /docs
 lib
 /oss-attribution
-*.tmp
-pnpm-lock.yaml
+*.tmp

CHANGELOG.md

@@ -2,17 +2,33 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [v0.2.3](https://git.odit.services/lfk/mailer/compare/v0.2.2...v0.2.3)
+
+- Fixed missing closing tag [`8e2bbb3`](https://git.odit.services/lfk/mailer/commit/8e2bbb324091c0ba28ccd24fc189b2e7ddab8ce3)
+
+#### [v0.2.2](https://git.odit.services/lfk/mailer/compare/v0.2.1...v0.2.2)
+
+> 3 February 2023
+
+- update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
+- 🚀Bumped version to v0.2.2 [`a616570`](https://git.odit.services/lfk/mailer/commit/a6165708a6a529bf219f28be74e2de71e64a2be5)
+- Merge pull request 'cleaned up mail texts for lfk 2023' (#16) from feature/simpler-mail-texts into main [`e7ad878`](https://git.odit.services/lfk/mailer/commit/e7ad878fb93773d1dec35d3b8b9c4f7b4b773221)
+- cleaned up mail texts for lfk 2023 [`1eb1a0a`](https://git.odit.services/lfk/mailer/commit/1eb1a0ad7e11b8f25b2b8d0efea991cab444c6ee)
+
 #### [v0.2.1](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.2.1)
 
+> 2 February 2023
+
 - update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
 - Moved Release management to releaseit [`68bd293`](https://git.odit.services/lfk/mailer/commit/68bd293acb474fe8f201423ffd442d0ee186a482)
-- 🚀Bumped version to v0.2.0 [`84e3778`](https://git.odit.services/lfk/mailer/commit/84e3778b8962834b57ee92ba01a0b02505bbc7e7)
-- Merge pull request 'feature/kaniko' (#18) from feature/kaniko into dev [`4ca5f9d`](https://git.odit.services/lfk/mailer/commit/4ca5f9d38dc3300d0bcbf8448283b53b484a827d)
 - Fresh licenses 4 yall [`c48a2ed`](https://git.odit.services/lfk/mailer/commit/c48a2ed01e65dc20c562d80099ca7448a8725446)
 - Version pinning [`22470d6`](https://git.odit.services/lfk/mailer/commit/22470d6160b450515966e7e38c37c45085f8ceb2)
+- 🚀Bumped version to v0.2.1 [`da4f497`](https://git.odit.services/lfk/mailer/commit/da4f497e887e788adf6d39f71d61488157c8381a)
 - Now building w/ kaniko [`f422f98`](https://git.odit.services/lfk/mailer/commit/f422f989c7d5c2fead70e37fc314b734034916f7)
 - 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39)
 - Bumped used ci node images [`0692b72`](https://git.odit.services/lfk/mailer/commit/0692b72955974c2fdee6441d4e7838d41dde8ed6)
+- 🚀Bumped version to v0.2.0 [`84e3778`](https://git.odit.services/lfk/mailer/commit/84e3778b8962834b57ee92ba01a0b02505bbc7e7)
+- Merge pull request 'feature/kaniko' (#18) from feature/kaniko into dev [`4ca5f9d`](https://git.odit.services/lfk/mailer/commit/4ca5f9d38dc3300d0bcbf8448283b53b484a827d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c)
 - Bumped docker node [`af173dc`](https://git.odit.services/lfk/mailer/commit/af173dcec822f12d8233b717304ad82b7fac14db)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e155454`](https://git.odit.services/lfk/mailer/commit/e155454013aa32e31db6afe5d6cb476c21d38aba)

Dockerfile

@@ -1,16 +1,20 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
+FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16 as build
+ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
+
 COPY package.json ./
-RUN npm i -g pnpm
-RUN pnpm i
+RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
+RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
+
 COPY tsconfig.json ./
 COPY src ./src
-RUN pnpm run build
+RUN pnpm run build \
+    && rm -rf /app/node_modules \
+    && pnpm i --production --prefer-offline
+
 # final image
 FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
-COPY package.json ./
-RUN npm i -g pnpm
-RUN pnpm i --prod
-COPY --from=0 /app/dist dist
+COPY --from=build /app/dist dist
+COPY --from=build /app/node_modules /app/node_modules
 ENTRYPOINT ["node", "dist/app.js"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-mailer",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)",
   "main": "src/app.ts",
   "scripts": {
@@ -95,5 +95,8 @@
     "hooks": {
       "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md"
     }
+  },
+  "engines": {
+    "pnpm": "8.0.0"
   }
-}
+}

src/locales/de.json

@@ -2,9 +2,9 @@
     "a-password-reset-for-your-account-got-requested": "Ein Passwort Reset wurde für dein Konto beantragt.",
     "all-rights-reserved": "Alle Rechte vorbehalten",
     "event_name-registration": "{{event_name}} Registrierung",
-    "if-you-didnt-register-yourself-you-should-contact-us-to-get-your-data-removed-from-our-systems": "Solltest du dich nicht selbst registriert haben schick uns bitte eine Mail und wir entfernen deine Daten aus unserem System: ",
+    "if-you-didnt-register-yourself-you-should-contact-us-to-get-your-data-removed-from-our-systems": "Solltest du dich nicht selbst registriert haben, sende uns bitte eine Mail und wir entfernen deine Daten aus unserem System: ",
     "if-you-didnt-request-the-reset-please-ignore-this-mail": "Solltest du den Reset nicht beantragt haben kannst du diese Mail einfach ignorieren.",
-    "if-you-ever-loose-the-link-you-can-request-a-new-one-by-visiting-our-website": "Solltest du den Link verlieren kannst du auf unserer Website einen neuen beantragen:",
+    "if-you-ever-loose-the-link-you-can-request-a-new-one-by-visiting-our-website": "Auf unserer Website kannst du jederzeit einen neuen Login-Link beantragen:",
     "imprint": "Impressum",
     "lfk-mail-test": "{{copyright_owner}} - Mail test",
     "lfk-password-reset": "{{copyright_owner}} - Passwort zurücksetzen",
@@ -13,8 +13,8 @@
     "reset-password": "Passwort zurücksetzen",
     "test-mail": "Test mail",
     "thank-you-for-requesting-a-new-link-to-your-event_name-runner-profile": "Danke, dass du einen neuen Profillink für das {{event_name}} Läuferstem beantragt hast.",
-    "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung und willkommen beim {{event_name}}!",
-    "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Du must nichts weiter machen, außer deinen Registrierungscode zum Lauf mitzubringen.",
+    "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung beim {{event_name}}",
+    "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Bitte bringe deinen Registrierungscode zum Lauf am 21.04.2023 mit.",
     "this-is-a-test-mail-triggered-by-an-admin-in-the-lfk-backend": "Das ist eine Testmail, die von einem Admin im LfK! Backend erzeugt wurde.",
     "this-mail-was-sent-to-recipient_mail-because-someone-request-a-mail-test-for-this-mail-address": "Du bekommst diese Mail, weil jemand eine Testmail für deine Mail-Adresse angefragt hat.",
     "this-mail-was-sent-to-you-because-someone-request-a-password-reset-for-a-account-linked-to-the-mail-address": "Du bekommst diese E-Mail, weil jemand einen Passwort-Reset für deinen Account beantragt hat.",
@@ -24,7 +24,7 @@
     "view-my-data": "Meine Daten",
     "we-successfully-processed-your-registration": "Wir haben deine Registrierung erfolgreich verarbeitet.",
     "welcome": "Willkommen",
-    "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Du kannst deinen Registrierungscode, deine Rundenzeiten und vieles mehr im Selfservice einsehen:",
+    "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Deinen Registrierungscode, Rundenzeiten und vieles mehr kannst du im Selfservice einsehen:",
     "your-event_name-profile": "Dein {{event_name}} Profil",
     "your-password-wont-be-changed-until-you-click-the-reset-link-below-and-set-a-new-one": "Dein Passwort wird erst zurückgesetzt, wenn du den Reset-Link öffnest und ein neues Passwort setzt.",
     "your-profile": "Dein Profil"

src/templates/runner_forgot.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="de" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml">
 <head>
-    <title>{{__ "your-event_name-profile"}}<title> <!-- The title tag shows in email notifications, like Android 4.4. -->
+    <title>{{__ "your-event_name-profile"}}</title> <!-- The title tag shows in email notifications, like Android 4.4. -->
     <meta charset="utf-8"> <!-- utf-8 works for most cases -->
     <meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
     <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->