fix: 🐛 dockerignore handling

Signed-off-by: Manuel Ruck <[email protected]>

.github/workflows/build-and-push.yaml

@@ -92,7 +92,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: infra/Dockerfile.service
+          file: infra/service.Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.actor != 'dependabot[bot]' }}
           target: runner

README.md

@@ -143,7 +143,7 @@ docker buildx build \
     --build-arg SERVICE=$SERVICE \
     --build-arg SERVICE_PATH=$SERVICE_PATH \
     --build-arg NODE_VERSION=$(cat .node-version | tr -d 'v') \
-    -f infra/Dockerfile.service \
+    -f infra/service.Dockerfile \
     -t $SERVICE \
     .
 ```

bundestag.io/admin/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   targetStage:
     $if: ${this.mode == "sync"}
     $then: dev

bundestag.io/api/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   targetStage:
     $if: ${this.mode == "sync"}
     $then: dev

countDependencies.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const path = require('path');
+
+const ignoreDirs = ['node_modules', '.git', '.garden'];
+
+const searchDirectory = (dir, fileList = []) => {
+  const files = fs.readdirSync(dir);
+  files.forEach((file) => {
+    if (ignoreDirs.includes(file)) {
+      return;
+    }
+    const filePath = path.join(dir, file);
+    if (fs.statSync(filePath).isDirectory()) {
+      searchDirectory(filePath, fileList);
+    } else if (file === 'package.json') {
+      fileList.push(filePath);
+    }
+  });
+  return fileList;
+};
+
+const countDependencies = (fileList) => {
+  const dependencyCount = {};
+  fileList.forEach((file) => {
+    const packageJson = JSON.parse(fs.readFileSync(file, 'utf8'));
+    const dependencies = { ...packageJson.dependencies, ...packageJson.devDependencies };
+    for (const dep in dependencies) {
+      if (dependencyCount[dep]) {
+        dependencyCount[dep]++;
+      } else {
+        dependencyCount[dep] = 1;
+      }
+    }
+  });
+  return dependencyCount;
+};
+
+const dir = '.'; // Start directory
+const packageJsonFiles = searchDirectory(dir);
+const dependencies = countDependencies(packageJsonFiles);
+
+const sortedDependencies = Object.entries(dependencies).sort((a, b) => b[1] - a[1]);
+console.log('Most used dependencies:');
+sortedDependencies.forEach(([dep, count]) => {
+  console.log(`${dep}: ${count}`);
+});

democracy/desktop/garden.yml

@@ -5,9 +5,9 @@ source:
   path: ../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   targetStage:
     $if: ${this.mode == "sync"}
     $then: dev

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - democracy
   bundestag-io:
     build:
-      dockerfile: ./infra/Dockerfile.service
+      dockerfile: ./infra/service.Dockerfile
       target: dev
       args:
         - NODE_VERSION=18.18.2
@@ -32,7 +32,7 @@ services:
       - democracy
   bio-admin:
     build:
-      dockerfile: ./infra/Dockerfile.service
+      dockerfile: ./infra/service.Dockerfile
       target: dev
       args:
         - NODE_VERSION=18.18.2

bundestag.io/admin/.dockerignore → infra/service.Dockerfile.dockerignore

@@ -1,10 +1,8 @@
+env*
 .git
 node_modules
 logs
-.env
-.env.*
-.next
 *.log
 .turbo
-manifests
-.garden
+.garden
+manifests

package.json

@@ -6,7 +6,7 @@
   "author": "Manuel Ruck <[email protected]>",
   "license": "Apache-2.0",
   "private": true,
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].1",
   "scripts": {
     "build": "turbo run build",
     "lint": "turbo run lint",

services/cron-jobs/cleanup-push-queue/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: cleanup-push-queue

services/cron-jobs/crawler/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: crawler

services/cron-jobs/import-conference-week-details/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: import-conference-week-details

services/cron-jobs/import-deputy-profiles/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: import-deputy-profiles

services/cron-jobs/import-named-poll-deputies/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: import-named-poll-deputies

services/cron-jobs/import-named-polls/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: import-named-polls

services/cron-jobs/import-plenary-minutes/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: import-plenary-minutes

services/cron-jobs/index-sync-bundestagio/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: index-sync-bundestagio

services/cron-jobs/index-sync-democracy/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: index-sync-democracy

services/cron-jobs/push-send-queued/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: push-send-queued
@@ -51,4 +51,3 @@ spec:
           SERVICE_ACCOUNT_CLIENT_EMAIL: ${base64Encode(var.SERVICE_ACCOUNT_CLIENT_EMAIL)}
           SERVICE_ACCOUNT_PRIVATE_KEY: ${base64Encode(var.SERVICE_ACCOUNT_PRIVATE_KEY)}
           SERVICE_ACCOUNT_PROJECT_ID: ${base64Encode(var.SERVICE_ACCOUNT_PROJECT_ID)}
-

services/cron-jobs/queue-pushs-conference-week/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: queue-pushs-conference-week

services/cron-jobs/queue-pushs-vote-conference-week/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: queue-pushs-vote-conference-week

services/cron-jobs/queue-pushs-vote-top-100/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: queue-pushs-vote-top-100

services/cron-jobs/shedule-bio-resync/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: shedule-bio-resync

services/cron-jobs/sync-deputy-profiles/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: sync-deputy-profiles

services/cron-jobs/sync-named-polls/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: sync-named-polls

services/cron-jobs/sync-procedures/garden.yml

@@ -6,9 +6,9 @@ source:
   path: ../../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: sync-procedures

services/non-named-votes-ai/garden.yml

@@ -5,9 +5,9 @@ source:
   path: ../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: non-named-votes-ai

services/qr-code-handler/garden.yml

@@ -5,9 +5,9 @@ source:
   path: ../../
 include:
   - ./**/*
-  - ./infra/Dockerfile.service
+  - ./infra/service.Dockerfile
 spec:
-  dockerfile: ./infra/Dockerfile.service
+  dockerfile: ./infra/service.Dockerfile
   buildArgs:
     NODE_VERSION: 18.18.2
     SERVICE: qr-code-handler