Skip to content

Merge master into production #275

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.

Sign up for GitHub

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

Merged
aleksandrychev merged 6 commits into from
Jun 29, 2026
Merged

Merge master into production #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71042a9
Bump undici from 7.26.0 to 7.28.0
dependabot[bot] Jun 20, 2026
0cb6a41
Bump less in the npm-dependencies group across 1 directory
dependabot[bot] Jun 24, 2026
de6d7e5
Fixed docker build with k8s runner
aleksandrychev Jun 24, 2026
fef17c4
Merge pull request #274 from aleksandrychev/fix-docker-build
olehermanse Jun 24, 2026
3783431
Merge pull request #272 from cfengine/dependabot/npm_and_yarn/undici-…
aleksandrychev Jun 24, 2026
02a3bb3
Merge pull request #270 from cfengine/dependabot/npm_and_yarn/npm-dep…
aleksandrychev Jun 24, 2026
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
12 changes: 12 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
variables:
DOCKER_REPOSITORY: registry.mender.io/cfengine/cfbuild
DOCKERFILE: Dockerfile
DOCKER_HOST:
value: 'tcp://docker:2376'
description: "Required to run dind inside k8s runners with TLS"
DOCKER_TLS_CERTDIR:
value: '/certs'
description: "The cert dir inside the gitlab runner. Don't change this."
DOCKER_TLS_VERIFY:
value: "1"
description: "Enable TLS verification for docker in dind"
DOCKER_CERT_PATH:
value: "$DOCKER_TLS_CERTDIR/client"
description: "Used for docker entrypoints. See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/4125"

include:
- project: 'Northern.tech/Mender/mendertesting'
Expand Down
52 changes: 16 additions & 36 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"devDependencies": {
"flexsearch": "^0.8.212",
"jsdom": "^29.1.1",
"less": "^4.6.4",
"less": "^4.6.7",
"uglify-js": "^3.19.3"
},
"scripts": {
Expand Down
Loading