.drone.yml

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

.gitignore

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

Dockerfile

@@ -1,20 +1,16 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16 as build
+FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
-ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
-
 COPY package.json ./
-RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
+RUN npm i -g pnpm
-RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
+RUN 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 --from=build /app/dist dist
+COPY package.json ./
-COPY --from=build /app/node_modules /app/node_modules
+RUN npm i -g pnpm
+RUN pnpm i --prod
+COPY --from=0 /app/dist dist
 ENTRYPOINT ["node", "dist/app.js"]

package.json

@@ -95,8 +95,5 @@
     "hooks": {
       "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md"
     }
-  },
-  "engines": {
-    "pnpm": "8.0.0"
   }
-}
+}