Merge pull request #943 from CubeArtisan/csv-override

chore(docker): Fix deployment files.

.docker/Dockerfile

@@ -1,12 +1,13 @@
-FROM node:16.10
+FROM node:20.9
 
 LABEL org.containers.image.url=https://github.com/CubeArtisan/cubeartisan
 
 ENV DEBUG=false
 ENV NODE_ENV=production
 
-RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH $PATH:/root/google-cloud-sdk/bin
+RUN curl https://sdk.cloud.google.com > install.sh
+RUN bash install.sh --disable-prompts --install-dir=/root/
+ENV PATH $PATH:/root/google-cloud-sd --install-dir=/root/k/bin
 RUN apt-get update && apt-get install -y gcc python3-dev python3-setuptools python3-pip python3-crcmod
 
 WORKDIR /CubeArtisan

.docker/Dockerfile.jobs

@@ -1,12 +1,13 @@
-FROM node:16.10
+FROM node:20.9
 
 LABEL org.containers.image.url=https://github.com/CubeArtisan/cubeartisan
 
 ENV DEBUG=false
 ENV NODE_ENV=production
 
-RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH $PATH:/root/google-cloud-sdk/bin
+RUN curl https://sdk.cloud.google.com > install.sh
+RUN bash install.sh --disable-prompts --install-dir=/root/
+ENV PATH $PATH:/root/google-cloud-sd --install-dir=/root/k/bin
 RUN apt-get update && apt-get install -y gcc python3-dev python3-setuptools python3-pip python3-crcmod
 
 WORKDIR /CubeArtisan

.docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   cubeartisan-mongodb:
-    image: 'mongo:4.4.10'
+    image: 'mongo:6.0.5'
     volumes:
       - cubeartisan-mongodb-volume:/data/db
     ports:
@@ -10,7 +10,7 @@ services:
     build:
       dockerfile: .docker/Dockerfile.jobs
       context: ../
-      cache_from: 
+      cache_from:
         - ${REPOSITORY}/cubeartisan-jobs:latest
     image: ${REPOSITORY}/cubeartisan-jobs:${TAG}
     depends_on:
@@ -19,7 +19,7 @@ services:
     build:
       dockerfile: .docker/Dockerfile
       context: ../
-      cache_from: 
+      cache_from:
         - ${REPOSITORY}/cubeartisan-jobs:${TAG}
       args:
         REPOSITORY: ${REPOSITORY}

flake.nix

@@ -9,7 +9,7 @@
       let pkgs = nixpkgs.legacyPackages.${system};
         drv = with pkgs; pkgs.mkShell {
           name = "shell";
-          buildInputs = [nodejs-16_x pkg-config cairo pango libpng libjpeg giflib gcc libuuid.out yarn docker-compose];
+          buildInputs = [nodejs_20 pkg-config cairo pango libpng libjpeg giflib gcc libuuid.out yarn docker-compose];
           shellHook = ''
             export LD_LIBRARY_PATH=${libuuid.out}/lib:$LD_LIBRARY_PATH
           '';

server/package.json

@@ -1,114 +1,113 @@
 {
-  "name": "@cubeartisan/server",
-  "version": "0.1.0",
-  "main": "routes/index.js",
-  "license": "AGPL-3.0-only",
-  "type": "module",
-  "scripts": {
-    "list-files": "git ls-files '*.js' '*.cjs' '*.mjs' '*.jsx'",
-    "list-files:all": "git ls-files '../client/*.js' '../client/*.jsx' '../client/*.mjs' '../client/*.cjs' '*.js' '*.jsx' '*.cjs' '*.mjs' '../markdown/*.js'",
-    "node-options": "echo '--experimental-loader @node-loader/babel --require dotenv/config --max-old-space-size=4096 --experimental-json-modules --enable-source-maps --es-module-specifier-resolution=node'",
-    "cards": "node --max-old-space-size=4096 `yarn --silent node-options` scripts/force_update.js",
-    "lint": "eslint_d --quiet `yarn --silent list-files`",
-    "lint:loud": "eslint_d `yarn --silent list-files`",
-    "lint:fix": "eslint_d --fix `yarn --silent list-files`",
-    "server": "node `yarn --silent node-options` routes/index.js",
-    "nodemon": "nodemon -x 'node' --ignore public --ignore private --ignore __tests__ --ignore __mocks__ --ignore ../client/__tests__ --ignore '*.json' `printf ' -w %s' \\`yarn --silent list-files:all\\`` -w ../client/generated -- `yarn --silent node-options` routes/index.js",
-    "start": "yarn nodemon",
-    "test:loud": "jest --detectOpenHandles --coverage",
-    "test": "yarn test:loud --silent",
-    "test:watch": "yarn test:loud --watch --verbose false"
-  },
-  "dependencies": {
-    "@babel/core": "^7.14.6",
-    "@babel/node": "^7.14.7",
-    "@babel/plugin-syntax-top-level-await": "^7.14.5",
-    "@babel/preset-react": "^7.14.5",
-    "@cubeartisan/client": "^0.1.0",
-    "@cubeartisan/markdown": "^0.1.0",
-    "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.13.0",
-    "@google-cloud/opentelemetry-cloud-trace-exporter": "^1.0.0",
-    "@node-loader/babel": "^1.1.0",
-    "@opentelemetry/api": "^1.0.3",
-    "@opentelemetry/instrumentation": "^0.26.0",
-    "@opentelemetry/instrumentation-dns": "^0.27.1",
-    "@opentelemetry/instrumentation-express": "^0.28.0",
-    "@opentelemetry/instrumentation-http": "^0.27.0",
-    "@opentelemetry/instrumentation-mongodb": "^0.28.0",
-    "@opentelemetry/instrumentation-winston": "^0.27.1",
-    "@opentelemetry/sdk-node": "^0.26.0",
-    "JSONStream": "^1.3.5",
-    "axios": "^0.26.0",
-    "babel-plugin-styled-components": "^1.13.2",
-    "bad-words": "^3.0.3",
-    "bcryptjs": "^2.4.3",
-    "body-parser": "^1.19.0",
-    "cheerio": "^1.0.0-rc.3",
-    "compression": "^1.7.4",
-    "connect-flash": "^0.1.1",
-    "connect-mongodb-session": "^3.1.1",
-    "core-js": "^3.21.1",
-    "core-js-pure": "^3.15.2",
-    "csurf": "^1.10.0",
-    "dotenv": "^8.2.0",
-    "email-templates": "^8.0.7",
-    "event-stream": "^4.0.1",
-    "express": "^4.17.1",
-    "express-fileupload": "^1.1.9",
-    "express-messages": "^1.0.1",
-    "express-rate-limit": "^5.1.3",
-    "express-session": "^1.17.0",
-    "express-validator": "^6.4.0",
-    "glob": "^7.1.6",
-    "mongodb": "^4.3.1",
-    "mongodb-client-encryption": "^1.2.6",
-    "mongoose": "^5.12.10",
-    "mongoose-seed": "^0.6.0",
-    "node-cache": "^5.1.2",
-    "node-fetch": "^2.6.1",
-    "node-schedule": "^1.3.2",
-    "nodemailer": "^6.4.16",
-    "on-finished": "^2.3.0",
-    "opentelemetry-instrumentation-socket.io": "^0.26.0",
-    "papaparse": "^5.2.0",
-    "passport": "^0.5.2",
-    "passport-local": "^1.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "rimraf": "^3.0.2",
-    "rss": "^1.2.2",
-    "rss-parser": "^3.9.0",
-    "sanitize-html": "^2.3.2",
-    "seedrandom": "^3.0.5",
-    "serialize-javascript": "^6.0.0",
-    "sharp": "^0.29.1",
-    "shuffle-seed": "^1.1.6",
-    "sinon": "^11.1.1",
-    "socket.io": "^4.1.3",
-    "styled-components": "^5.3.0",
-    "supertest": "^6.1.3",
-    "uuid": "^3.4.0",
-    "winston": "^3.3.3"
-  },
-  "devDependencies": {
-    "@babel/eslint-parser": "^7.14.7",
-    "@cubeartisan/server": "^0.1.0",
-    "@types/express": "^4.17.13",
-    "eslint": "^7.30.0",
-    "eslint-config-airbnb": "^18.0.1",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-array-func": "^3.1.7",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jest": "^23.9.0",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint_d": "^11.1.1",
-    "jest": "26.x.x",
-    "mongodb-memory-server": "^8.3.0",
-    "nodemon": "^2.0.2",
-    "prettier": "^2.3.0",
-    "webpack": "^5.42.0",
-    "webpack-merge": "^4.2.2"
-  }
+    "name": "@cubeartisan/server",
+    "version": "0.1.0",
+    "main": "routes/index.js",
+    "license": "AGPL-3.0-only",
+    "type": "module",
+    "scripts": {
+        "list-files": "git ls-files '*.js' '*.cjs' '*.mjs' '*.jsx'",
+        "list-files:all": "git ls-files '../client/*.js' '../client/*.jsx' '../client/*.mjs' '../client/*.cjs' '*.js' '*.jsx' '*.cjs' '*.mjs' '../markdown/*.js'",
+        "node-options": "echo '--experimental-loader @node-loader/babel --require dotenv/config --max-old-space-size=4096 --experimental-json-modules --enable-source-maps --es-module-specifier-resolution=node'",
+        "cards": "node --max-old-space-size=4096 `yarn --silent node-options` scripts/force_update.js",
+        "lint": "eslint_d --quiet `yarn --silent list-files`",
+        "lint:loud": "eslint_d `yarn --silent list-files`",
+        "lint:fix": "eslint_d --fix `yarn --silent list-files`",
+        "server": "node `yarn --silent node-options` routes/index.js",
+        "nodemon": "nodemon -x 'node' --ignore public --ignore private --ignore __tests__ --ignore __mocks__ --ignore ../client/__tests__ --ignore '*.json' `printf ' -w %s' \\`yarn --silent list-files:all\\`` -w ../client/generated -- `yarn --silent node-options` routes/index.js",
+        "start": "yarn nodemon",
+        "test:loud": "jest --detectOpenHandles --coverage",
+        "test": "yarn test:loud --silent",
+        "test:watch": "yarn test:loud --watch --verbose false"
+    },
+    "dependencies": {
+        "@babel/core": "^7.14.6",
+        "@babel/node": "^7.14.7",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/preset-react": "^7.14.5",
+        "@cubeartisan/client": "^0.1.0",
+        "@cubeartisan/markdown": "^0.1.0",
+        "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.13.0",
+        "@google-cloud/opentelemetry-cloud-trace-exporter": "^1.0.0",
+        "@node-loader/babel": "^2.0.1",
+        "@opentelemetry/api": "^1.0.3",
+        "@opentelemetry/instrumentation": "^0.26.0",
+        "@opentelemetry/instrumentation-dns": "^0.27.1",
+        "@opentelemetry/instrumentation-express": "^0.28.0",
+        "@opentelemetry/instrumentation-http": "^0.27.0",
+        "@opentelemetry/instrumentation-mongodb": "^0.28.0",
+        "@opentelemetry/instrumentation-winston": "^0.27.1",
+        "@opentelemetry/sdk-node": "^0.26.0",
+        "JSONStream": "^1.3.5",
+        "axios": "^0.26.0",
+        "babel-plugin-styled-components": "^1.13.2",
+        "bad-words": "^3.0.3",
+        "bcryptjs": "^2.4.3",
+        "body-parser": "^1.19.0",
+        "cheerio": "^1.0.0-rc.3",
+        "compression": "^1.7.4",
+        "connect-flash": "^0.1.1",
+        "connect-mongodb-session": "^3.1.1",
+        "core-js": "^3.21.1",
+        "core-js-pure": "^3.15.2",
+        "csurf": "^1.10.0",
+        "dotenv": "^8.2.0",
+        "email-templates": "^8.0.7",
+        "event-stream": "^4.0.1",
+        "express": "^4.17.1",
+        "express-fileupload": "^1.1.9",
+        "express-messages": "^1.0.1",
+        "express-rate-limit": "^5.1.3",
+        "express-session": "^1.17.0",
+        "express-validator": "^6.4.0",
+        "glob": "^7.1.6",
+        "mongodb": "^4.3.1",
+        "mongoose": "^5.12.10",
+        "mongoose-seed": "^0.6.0",
+        "node-cache": "^5.1.2",
+        "node-fetch": "^2.6.1",
+        "node-schedule": "^1.3.2",
+        "nodemailer": "^6.4.16",
+        "on-finished": "^2.3.0",
+        "opentelemetry-instrumentation-socket.io": "^0.26.0",
+        "papaparse": "^5.2.0",
+        "passport": "^0.5.2",
+        "passport-local": "^1.0.0",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "rimraf": "^3.0.2",
+        "rss": "^1.2.2",
+        "rss-parser": "^3.9.0",
+        "sanitize-html": "^2.3.2",
+        "seedrandom": "^3.0.5",
+        "serialize-javascript": "^6.0.0",
+        "sharp": "^0.29.1",
+        "shuffle-seed": "^1.1.6",
+        "sinon": "^11.1.1",
+        "socket.io": "^4.1.3",
+        "styled-components": "^5.3.0",
+        "supertest": "^6.1.3",
+        "uuid": "^3.4.0",
+        "winston": "^3.3.3"
+    },
+    "devDependencies": {
+        "@babel/eslint-parser": "^7.14.7",
+        "@cubeartisan/server": "^0.1.0",
+        "@types/express": "^4.17.13",
+        "eslint": "^7.30.0",
+        "eslint-config-airbnb": "^18.0.1",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-array-func": "^3.1.7",
+        "eslint-plugin-import": "^2.20.2",
+        "eslint-plugin-jest": "^23.9.0",
+        "eslint-plugin-jsx-a11y": "^6.2.3",
+        "eslint-plugin-prettier": "^4.0.0",
+        "eslint-plugin-promise": "^5.1.0",
+        "eslint_d": "^11.1.1",
+        "jest": "26.x.x",
+        "mongodb-memory-server": "^8.3.0",
+        "nodemon": "^2.0.2",
+        "prettier": "^2.3.0",
+        "webpack": "^5.42.0",
+        "webpack-merge": "^4.2.2"
+    }
 }