Skip to content

Commit

Permalink
Merge pull request #217 from zazuko/ci-docker
Browse files Browse the repository at this point in the history
Use node 20 as base of the Docker image
  • Loading branch information
ludovicm67 committed Dec 5, 2023
2 parents 2be9954 + 5a7e424 commit e969a77
Show file tree
Hide file tree
Showing 7 changed files with 1,802 additions and 1,583 deletions.
5 changes: 5 additions & 0 deletions .changeset/cuddly-vans-pay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"trifid": minor
---

The Docker image now uses node 20 as base
3 changes: 0 additions & 3 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Build and push Docker image

on:
push:
branches:
- main
tags:
- "trifid@*.*.*"

Expand Down Expand Up @@ -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}}
Expand Down
3,353 changes: 1,787 additions & 1,566 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 0 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
"bin": {
"trifid-core": "./server.js"
},
"engines": {
"node": ">=16",
"npm": ">=8"
},
"dependencies": {
"absolute-url": "^1.2.2",
"ajv": "^8.12.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/trifid/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/node:18-alpine
FROM docker.io/library/node:20-alpine

EXPOSE 8080

Expand Down
12 changes: 6 additions & 6 deletions packages/trifid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit e969a77

Please sign in to comment.