Browse Source

Merge branch 'master' into production

pull/695/head
Emile Nijssen 1 year ago
parent
commit
d492b334d8
  1. 2
      .github/workflows/lint.yml
  2. 4
      Dockerfile
  3. 2
      docs/changelog.json
  4. 4
      src/package-lock.json
  5. 2
      src/package.json

2
.github/workflows/lint.yml

@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
with: with:
node-version: '20' node-version: '18'
- run: | - run: |
cd src cd src

4
Dockerfile

@ -1,4 +1,4 @@
FROM docker.io/library/node:20-alpine AS build_node_modules FROM docker.io/library/node:18-alpine AS build_node_modules
# Copy Web UI # Copy Web UI
COPY src/ /app/ COPY src/ /app/
@ -7,7 +7,7 @@ RUN npm ci --production
# Copy build result to a new image. # Copy build result to a new image.
# This saves a lot of disk space. # This saves a lot of disk space.
FROM docker.io/library/node:20-alpine FROM docker.io/library/node:18-alpine
COPY --from=build_node_modules /app /app COPY --from=build_node_modules /app /app
# Move node_modules one directory up, so during development # Move node_modules one directory up, so during development

2
docs/changelog.json

@ -6,5 +6,5 @@
"5": "Many small improvements & feature requests. Enjoy!", "5": "Many small improvements & feature requests. Enjoy!",
"6": "Many small performance improvements & bug fixes. Enjoy!", "6": "Many small performance improvements & bug fixes. Enjoy!",
"7": "Improved the look & performance of the upload/download chart.", "7": "Improved the look & performance of the upload/download chart.",
"8": "Updated to Node.js v20." "8": "Updated to Node.js v18."
} }

4
src/package-lock.json

@ -20,7 +20,7 @@
"eslint-config-athom": "^2.1.0" "eslint-config-athom": "^2.1.0"
}, },
"engines": { "engines": {
"node": "20" "node": "18"
} }
}, },
"node_modules/@aashutoshrathi/word-wrap": { "node_modules/@aashutoshrathi/word-wrap": {
@ -3774,4 +3774,4 @@
} }
} }
} }
} }

2
src/package.json

@ -23,6 +23,6 @@
"eslint-config-athom": "^2.1.0" "eslint-config-athom": "^2.1.0"
}, },
"engines": { "engines": {
"node": "20" "node": "18"
} }
} }
Loading…
Cancel
Save