Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker tweaks and node update #2911

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/update-website/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ inputs:
description: 'the email of the pull request author'
required: true
runs:
using: 'node20'
using: 'node22'
main: 'dist/index.js'
2 changes: 1 addition & 1 deletion .github/workflows/check-dist-update-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: '22'

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Install npm dependencies
run: npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- name: Checkout
uses: actions/checkout@v4
with:
Expand Down
21 changes: 11 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
FROM node:18
FROM node:22

COPY package-lock.json package.json /app/
COPY package-lock.json package.json /app/

WORKDIR /app

RUN npm install

COPY .babelrc \
.eslintrc.yml \
.nvmrc \
postcss.config.js \
webpack.common.js \
webpack.dev.js \
COPY .babelrc \
.eslintrc.yml \
.nvmrc \
postcss.config.js \
webpack.common.js \
webpack.dev.js \
webpack.prod.js /app/
Comment on lines -9 to +14
Copy link
Member Author

@kingthorin kingthorin Dec 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file seems to have had mixed line endings (or something)


COPY site/ /app/site
COPY src/ /app/src

RUN npm run build
CMD npm run preview

CMD ["npm", "run", "preview"]
Loading
Loading