From 066331cca841fb4a91cbadd6d624ee1b6119b3fe Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Wed, 5 Feb 2025 19:22:53 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=AA=F0=9F=90=9B=20Fix=20corepack=20bug?=
 =?UTF-8?q?,=20removed=20unused=20envs,=20npm=20in=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replaced pnpm to npm in docker container because of a bug infestation
- Remove only allow pnpm
- Added missing envs to docker compose
---
 .env.example                | 2 --
 .gitea/workflows/deploy.yml | 4 +---
 Dockerfile                  | 7 ++-----
 docker-compose.yml          | 7 ++++---
 package.json                | 1 -
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.env.example b/.env.example
index f373d73..4c5743e 100644
--- a/.env.example
+++ b/.env.example
@@ -9,8 +9,6 @@ ACTUAL_DATA_DIR=.cache
 BANK_INITIAL_REFRESH_TOKEN=initial-valid-refresh-token
 BANK_OAUTH_CLIENT_ID=your-client-id
 BANK_OAUTH_CLIENT_SECRET=your-client-secret
-BANK_OAUTH_STATE=your-state
-BANK_OAUTH_REDIRECT_URI=http://your-redirect-uri.com
 BANK_ACCOUNT_IDS=your-account-id1,your-account-id2
 # Configuration
 LOG_LEVEL=info# trace | error | warn | info | debug | trace
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 84c0f50..18de03c 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -15,13 +15,11 @@ jobs:
       ACTUAL_SERVER_URL: ${{ secrets.ACTUAL_SERVER_URL }}
       ACTUAL_PASSWORD: ${{ secrets.ACTUAL_PASSWORD }}
       ACTUAL_ACCOUNT_IDS: ${{ secrets.ACTUAL_ACCOUNT_IDS }}
-      ACTUAL_DATA_DIR: ${{ var.ACTUAL_DATA_DIR }}
+      ACTUAL_DATA_DIR: ${{ vars.ACTUAL_DATA_DIR }}
       # Bank
       BANK_INITIAL_REFRESH_TOKEN: ${{ secrets.BANK_INITIAL_REFRESH_TOKEN }}
       BANK_OAUTH_CLIENT_ID: ${{ secrets.BANK_OAUTH_CLIENT_ID }}
       BANK_OAUTH_CLIENT_SECRET: ${{ secrets.BANK_OAUTH_CLIENT_SECRET }}
-      BANK_OAUTH_STATE: ${{ secrets.BANK_OAUTH_STATE }}
-      BANK_OAUTH_REDIRECT_URI: ${{ secrets.BANK_OAUTH_REDIRECT_URI }}
       BANK_ACCOUNT_IDS: ${{ secrets.BANK_ACCOUNT_IDS }}
       # Configuration
       LOG_LEVEL: ${{ vars.LOG_LEVEL }}
diff --git a/Dockerfile b/Dockerfile
index d3f61f1..6c73068 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,6 @@ LABEL authors="Martin Berg Alstad"
 
 COPY . .
 
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
+RUN --mount=type=cache,id=npm,target=/store npm install --omit=dev --frozen-lockfile
 
-CMD ["pnpm", "start-prod"]
\ No newline at end of file
+ENTRYPOINT ["npm", "run", "start-prod"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e5d6708..ba2b76d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   server:
     container_name: actual_sparebank1_cronjob
-    restart: unless-stopped
+    restart: no
     build:
       context: .
     environment:
@@ -14,13 +14,14 @@ services:
       - BANK_INITIAL_REFRESH_TOKEN
       - BANK_OAUTH_CLIENT_ID
       - BANK_OAUTH_CLIENT_SECRET
-      - BANK_OAUTH_STATE
-      - BANK_OAUTH_REDIRECT_URI
       - BANK_ACCOUNT_IDS
       - LOG_LEVEL
       - DB_DIRECTORY # Required for Docker Compose
       - DB_FILENAME
+      - TRANSACTION_RELATIVE_FROM_DATE
+      - TRANSACTION_RELATIVE_TO_DATE
     volumes:
+      # TODO CACHE directory in volume?
       - data:/${DB_DIRECTORY}
 
 volumes:
diff --git a/package.json b/package.json
index e9087b1..c3400bc 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,6 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "preinstall": "npx only-allow pnpm",
     "start": "dotenvx run --env-file=.env.local -- node --import=tsx ./src/main.ts | pino-pretty",
     "start-prod": "node --import=tsx ./src/main.ts",
     "run-once": "ONCE=true dotenvx run --env-file=.env.local -- node --import=tsx ./src/main.ts | pino-pretty",