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

Combined PRs #4148

Merged
merged 40 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7b38e30
chore: Bump axios from 1.5.1 to 1.6.0 in /tests/e2e_tests
dependabot[bot] Nov 1, 2023
2f32b01
chore: Bump node from 20.8.0-alpine to 21.1.0-alpine
dependabot[bot] Nov 1, 2023
2489670
chore: Bump nginx from 1.25.2-alpine to 1.25.3-alpine
dependabot[bot] Nov 1, 2023
e2483f7
chore: Bump react-big-calendar from 1.8.4 to 1.8.5
dependabot[bot] Nov 1, 2023
ebe4f7d
chore: Bump @stripe/stripe-js from 2.1.6 to 2.1.10
dependabot[bot] Nov 1, 2023
dea0d12
chore: Bump msw from 0.36.8 to 2.0.1
dependabot[bot] Nov 1, 2023
922ea10
chore: Bump @testing-library/jest-dom from 6.1.2 to 6.1.4
dependabot[bot] Nov 1, 2023
c5799ce
chore: Bump jest-environment-jsdom from 29.6.4 to 29.7.0
dependabot[bot] Nov 1, 2023
17d2d98
chore: Bump uuid from 9.0.0 to 9.0.1
dependabot[bot] Nov 1, 2023
993c9cc
chore: Bump babel-jest from 29.6.4 to 29.7.0
dependabot[bot] Nov 1, 2023
145095e
chore: Bump jest-resolve from 29.6.4 to 29.7.0
dependabot[bot] Nov 1, 2023
a8d8c7f
chore: Bump @mui/styles from 5.14.11 to 5.14.16
dependabot[bot] Nov 1, 2023
8fc5441
chore: Bump @trivago/prettier-plugin-sort-imports from 4.2.0 to 4.2.1
dependabot[bot] Nov 1, 2023
f4d0534
chore: Bump @babel/plugin-transform-runtime from 7.22.10 to 7.23.2
dependabot[bot] Nov 1, 2023
c5f73bd
chore: Bump xterm-addon-search from 0.12.0 to 0.13.0
dependabot[bot] Nov 1, 2023
a62df44
chore: Bump react-router-dom from 6.15.0 to 6.18.0
dependabot[bot] Nov 1, 2023
d3bd5bf
chore: Bump eslint-plugin-import from 2.28.1 to 2.29.0
dependabot[bot] Nov 1, 2023
a5b4232
chore: Bump webpack from 5.88.2 to 5.89.0
dependabot[bot] Nov 1, 2023
cc01d49
chore: Bump @mdi/js from 7.2.96 to 7.3.67
dependabot[bot] Nov 1, 2023
d49bbd0
Merge dependabot/npm_and_yarn/mdi/js-7.3.67 into combined-prs-branch
github-actions[bot] Nov 1, 2023
a4cd009
Merge dependabot/npm_and_yarn/webpack-5.89.0 into combined-prs-branch
github-actions[bot] Nov 1, 2023
1e06942
Merge dependabot/npm_and_yarn/eslint-plugin-import-2.29.0 into combin…
github-actions[bot] Nov 1, 2023
4f106a3
Merge dependabot/npm_and_yarn/react-router-dom-6.18.0 into combined-p…
github-actions[bot] Nov 1, 2023
6f7fc9b
Merge dependabot/npm_and_yarn/xterm-addon-search-0.13.0 into combined…
github-actions[bot] Nov 1, 2023
7256496
Merge dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.23.2 i…
github-actions[bot] Nov 1, 2023
aaae148
Merge dependabot/npm_and_yarn/trivago/prettier-plugin-sort-imports-4.…
github-actions[bot] Nov 1, 2023
58b7170
Merge dependabot/npm_and_yarn/mui/styles-5.14.16 into combined-prs-br…
github-actions[bot] Nov 1, 2023
521cfd0
Merge dependabot/npm_and_yarn/jest-resolve-29.7.0 into combined-prs-b…
github-actions[bot] Nov 1, 2023
828e291
Merge dependabot/npm_and_yarn/babel-jest-29.7.0 into combined-prs-branch
github-actions[bot] Nov 1, 2023
ea88fff
Merge dependabot/npm_and_yarn/uuid-9.0.1 into combined-prs-branch
github-actions[bot] Nov 1, 2023
dea4813
Merge dependabot/npm_and_yarn/jest-environment-jsdom-29.7.0 into comb…
github-actions[bot] Nov 1, 2023
e1cfbf0
Merge dependabot/npm_and_yarn/testing-library/jest-dom-6.1.4 into com…
github-actions[bot] Nov 1, 2023
bf00298
Merge dependabot/npm_and_yarn/msw-2.0.1 into combined-prs-branch
github-actions[bot] Nov 1, 2023
7a70667
Merge dependabot/npm_and_yarn/stripe/stripe-js-2.1.10 into combined-p…
github-actions[bot] Nov 1, 2023
8dc4a68
Merge dependabot/npm_and_yarn/react-big-calendar-1.8.5 into combined-…
github-actions[bot] Nov 1, 2023
1ae0ddf
Merge dependabot/docker/nginx-1.25.3-alpine into combined-prs-branch
github-actions[bot] Nov 1, 2023
3eb2052
Merge dependabot/docker/node-21.1.0-alpine into combined-prs-branch
github-actions[bot] Nov 1, 2023
032cbe9
Merge dependabot/npm_and_yarn/tests/e2e_tests/axios-1.6.0 into combin…
github-actions[bot] Nov 1, 2023
5839032
revert: "Merge dependabot/npm_and_yarn/msw-2.0.1 into combined-prs-br…
mzedel Nov 2, 2023
09bbecb
chore: license location alignment
mzedel Nov 2, 2023
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM node:20.8.0-alpine AS base
FROM --platform=$BUILDPLATFORM node:21.1.0-alpine AS base
WORKDIR /usr/src/app
COPY package-lock.json package.json ./
RUN npm ci
Expand All @@ -25,7 +25,7 @@ HEALTHCHECK --interval=8s --timeout=15s --start-period=120s --retries=128 CMD wg
CMD ["nginx"]


FROM nginx:1.25.2-alpine AS production
FROM nginx:1.25.3-alpine AS production
EXPOSE 8080
WORKDIR /var/www/mender-gui/dist
ARG GIT_COMMIT_TAG
Expand Down
Loading
Loading