Switched ci over to pnpm cache

.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,9 +2,16 @@
 
 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)
 

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.2",
+  "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/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 -->