Skip to content

Commit

Permalink
Merge pull request #49 from e-flux-platform/fix/docker-and-yarn-build…
Browse files Browse the repository at this point in the history
…-fixes

Fix for favicons library and bump of Node version.
  • Loading branch information
michael-donat authored Feb 16, 2024
2 parents bae1b12 + c51afcd commit a2d9be2
Show file tree
Hide file tree
Showing 4 changed files with 1,400 additions and 203 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM --platform=linux/amd64 node:16.20.2-alpine
# alpine3.18 is used because of the issue with 'sharp' https://github.com/nodejs/docker-node/issues/2009#issuecomment-1855547128
FROM --platform=linux/amd64 node:18-alpine3.18

# Set work directory
WORKDIR /service
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.20.2-alpine
FROM node:18-alpine3.18

# Note layers should be ordered from less to more likely to change.

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"cssnano": "^5.0.0",
"draft-js": "^0.11.7",
"express-to-koa": "^2.0.0",
"favicons": "^7.1.2",
"favicons": "^6.2.1",
"favicons-webpack-plugin": "^5.0.2",
"github-markdown-css": "^4.0.0",
"google-map-react": "^2.1.10",
Expand Down Expand Up @@ -108,7 +108,7 @@
"webpack-bundle-analyzer": "^4.5.0"
},
"volta": {
"node": "16.13.0",
"node": "18.17.0",
"yarn": "1.22.17"
},
"prettier": "@bedrockio/prettier-config"
Expand Down
Loading

0 comments on commit a2d9be2

Please sign in to comment.