Merge pull request #217 from zazuko/ci-docker

Use node 20 as base of the Docker image
zazuko · Dec 5, 2023 · e969a77 · e969a77
2 parents 2be9954 + 5a7e424
commit e969a77
Show file tree

Hide file tree

Showing 7 changed files with 1,802 additions and 1,583 deletions.
diff --git a/.changeset/cuddly-vans-pay.md b/.changeset/cuddly-vans-pay.md
@@ -0,0 +1,5 @@
+---
+"trifid": minor
+---
+
+The Docker image now uses node 20 as base
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -2,8 +2,6 @@ name: Build and push Docker image
 
 on:
   push:
-    branches:
-      - main
     tags:
       - "trifid@*.*.*"
 
@@ -42,7 +40,6 @@ jobs:
             ghcr.io/zazuko/trifid
             zazuko/trifid
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=branch
             type=semver,prefix=trifid@,pattern={{version}}
             type=semver,prefix=trifid@,pattern={{major}}.{{minor}}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,12 +19,12 @@
     ]
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.26.2",
+    "@changesets/cli": "^2.27.1",
     "@tpluscode/eslint-config": "^0.4.4",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1"
+    "lint-staged": "^15.2.0"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -27,10 +27,6 @@
   "bin": {
     "trifid-core": "./server.js"
   },
-  "engines": {
-    "node": ">=16",
-    "npm": ">=8"
-  },
   "dependencies": {
     "absolute-url": "^1.2.2",
     "ajv": "^8.12.0",

diff --git a/packages/trifid/Dockerfile b/packages/trifid/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/node:18-alpine
+FROM docker.io/library/node:20-alpine
 
 EXPOSE 8080
 

diff --git a/packages/trifid/package.json b/packages/trifid/package.json
@@ -24,17 +24,17 @@
     "trifid": "./server.js"
   },
   "dependencies": {
-    "@zazuko/trifid-handle-redirects": "^0.1.2",
-    "@zazuko/trifid-plugin-sparql-proxy": "^1.1.1",
-    "@zazuko/trifid-entity-renderer": "^0.6.0",
-    "commander": "^11.0.0",
+    "@zazuko/trifid-handle-redirects": "^0.1.3",
+    "@zazuko/trifid-plugin-sparql-proxy": "^1.2.0",
+    "@zazuko/trifid-entity-renderer": "^0.6.2",
+    "commander": "^11.1.0",
     "morgan": "^1.10.0",
-    "trifid-core": "^2.6.3",
+    "trifid-core": "^2.7.1",
     "trifid-handler-fetch": "^2.0.1",
     "trifid-handler-sparql": "^2.1.1",
     "trifid-plugin-graph-explorer": "^1.0.2",
     "trifid-plugin-i18n": "^2.0.1",
     "trifid-plugin-spex": "^1.1.4",
-    "trifid-plugin-yasgui": "^2.2.4"
+    "trifid-plugin-yasgui": "^2.2.5"
   }
 }