Fix dbtool in built docker image and remove CI caching (#8072)

* temporarily disable ci

* disable sbt and target caches

* move commander into new tools/postgres/package.json; copy node_modules in dockerfile

* don't copy node_modules in dockerfile because assetsGenerationTask copies whole postgres folder anyway

* undo changes to docker ignore

* remove last circleci caching as it did more harm than good (reproducibility and performance)

* re-enable ci

Author: philippotto

.circleci/cache_version

@@ -40,16 +40,6 @@ jobs:
       - run:
           name: Prepare dependency folders
           command: mkdir -p project/target target ~/.ivy2 ~/.cache/coursier
-      - restore_cache:
-          name: Restore target cache
-          keys:
-            - target-cache-{{ checksum ".circleci/cache_version" }}-{{ .Branch }}
-            - target-cache-{{ checksum ".circleci/cache_version" }}-master
-      - restore_cache:
-          name: Restore sbt cache
-          keys:
-            - sbt-cache-{{ checksum ".circleci/cache_version" }}-{{ checksum "project/Dependencies.scala" }}
-            - sbt-cache-{{ checksum ".circleci/cache_version" }}-
       - run:
           name: Install frontend dependencies
           command: docker-compose run -e PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true base yarn install --immutable
@@ -91,20 +81,6 @@ jobs:
           name: Checksum App Dirs
           command: find app webknossos-datastore/app webknossos-tracingstore/app -type f -exec md5sum {} \; | sort -k 2 | md5sum > app_checksum.txt
 
-      - save_cache:
-          name: Save target cache
-          key: target-cache-{{ checksum ".circleci/cache_version" }}-{{ .Branch }}-{{ checksum "app_checksum.txt" }}
-          paths:
-            - "project/target"
-            - "target"
-
-      - save_cache:
-          name: Save sbt cache
-          key: sbt-cache-{{ checksum ".circleci/cache_version" }}-{{ checksum "project/Dependencies.scala" }}
-          paths:
-            - "~/.ivy2"
-            - "~/.cache/coursier"
-
       - run:
           name: Build webknossos docker image
           command: |

.circleci/config.yml

@@ -10,7 +10,6 @@ WORKDIR /webknossos
 
 COPY target/universal/stage .
 
-
 RUN addgroup --system --gid 999 webknossos \
   && adduser --system --uid 999 --ingroup webknossos webknossos \
   && mkdir disk \

Dockerfile

@@ -36,7 +36,6 @@
     "ava": "^6.1.3",
     "browserslist-to-esbuild": "^1.2.0",
     "c8": "^9.1.0",
-    "commander": "^10.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "coveralls": "^3.0.2",
     "css-loader": "^6.5.1",
@@ -117,7 +116,7 @@
     "coverage-local": "c8 report --reporter=html && echo Success! Open coverage/index.html",
     "coverage": "c8 report --reporter=text-lcov | coveralls",
     "apply-evolutions": "tools/postgres/dbtool.js apply-evolutions",
-    "postinstall": "cd tools/proxy && yarn install",
+    "postinstall": "cd tools/proxy && yarn install && cd ../postgres && yarn install",
     "typecheck": "yarn tsc",
     "ts": "yarn tsc",
     "ts-watch": "yarn tsc --watch",

package.json

@@ -0,0 +1,9 @@
+{
+  "name": "dbtool",
+  "version": "1.0.0",
+  "description": "",
+  "main": "dbtool.js",
+  "dependencies": {
+    "commander": "^10.0.0"
+  }
+}

tools/postgres/package.json

@@ -0,0 +1,21 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"commander@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "commander@npm:10.0.1"
+  checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3
+  languageName: node
+  linkType: hard
+
+"dbtool@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "dbtool@workspace:."
+  dependencies:
+    commander: "npm:^10.0.0"
+  languageName: unknown
+  linkType: soft

tools/postgres/yarn.lock

@@ -4299,7 +4299,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.0, commander@npm:^10.0.1":
+"commander@npm:^10.0.1":
   version: 10.0.1
   resolution: "commander@npm:10.0.1"
   checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3
@@ -13841,7 +13841,6 @@ __metadata:
     classnames: "npm:^2.2.5"
     color-hash: "npm:^2.0.1"
     comlink: "npm:^4.3.0"
-    commander: "npm:^10.0.0"
     copy-webpack-plugin: "npm:^11.0.0"
     coveralls: "npm:^3.0.2"
     css-loader: "npm:^6.5.1"