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

chore(deps): Update dependencies versions to remove CVE #13835

Merged
merged 1 commit into from
Aug 9, 2024
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.33.1",
"image": "grafana/loki-build-image:0.33.5",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
Expand Down
4 changes: 2 additions & 2 deletions .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ local promtail_win() = pipeline('promtail-windows') {
steps: [
{
name: 'identify-runner',
image: 'golang:1.19-windowsservercore-1809',
image: 'golang:1.22.5-windowsservercore-1809',
commands: [
'Write-Output $env:DRONE_RUNNER_NAME',
],
},
{
name: 'test',
image: 'golang:1.19-windowsservercore-1809',
image: 'golang:1.22.5-windowsservercore-1809',
commands: [
'go test .\\clients\\pkg\\promtail\\targets\\windows\\... -v',
],
Expand Down
46 changes: 23 additions & 23 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: check-drone-drift
- commands:
- make BUILD_IN_CONTAINER=false check-generated-files
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: check-generated-files
- commands:
- cd ..
Expand All @@ -110,7 +110,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: clone-target-branch
when:
event:
Expand All @@ -121,14 +121,14 @@ steps:
- clone-target-branch
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: test
- commands:
- cd ../loki-target-branch && BUILD_IN_CONTAINER=false make test
depends_on:
- clone-target-branch
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: test-target-branch
when:
event:
Expand All @@ -141,7 +141,7 @@ steps:
- test
- test-target-branch
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: compare-coverage
when:
event:
Expand All @@ -159,7 +159,7 @@ steps:
TOKEN:
from_secret: github_token
USER: grafanabot
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: report-coverage
when:
event:
Expand All @@ -169,15 +169,15 @@ steps:
depends_on:
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: lint
- commands:
- make BUILD_IN_CONTAINER=false check-mod
depends_on:
- test
- lint
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: check-mod
- commands:
- apk add make bash && make lint-scripts
Expand All @@ -188,21 +188,21 @@ steps:
depends_on:
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: loki
- commands:
- make BUILD_IN_CONTAINER=false check-doc
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: check-doc
- commands:
- make BUILD_IN_CONTAINER=false check-format GIT_TARGET_BRANCH="$DRONE_TARGET_BRANCH"
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: check-format
when:
event:
Expand All @@ -212,14 +212,14 @@ steps:
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: validate-example-configs
- commands:
- make BUILD_IN_CONTAINER=false check-example-config-doc
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: check-example-config-doc
- commands:
- mkdir -p /hugo/content/docs/loki/latest
Expand Down Expand Up @@ -252,7 +252,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: loki-mixin-check
when:
event:
Expand All @@ -277,7 +277,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: documentation-helm-reference-check
trigger:
ref:
Expand Down Expand Up @@ -1577,11 +1577,11 @@ platform:
steps:
- commands:
- Write-Output $env:DRONE_RUNNER_NAME
image: golang:1.19-windowsservercore-1809
image: golang:1.22.5-windowsservercore-1809
name: identify-runner
- commands:
- go test .\clients\pkg\promtail\targets\windows\... -v
image: golang:1.19-windowsservercore-1809
image: golang:1.22.5-windowsservercore-1809
name: test
trigger:
ref:
Expand Down Expand Up @@ -1683,15 +1683,15 @@ steps:
NFPM_SIGNING_KEY:
from_secret: gpg_private_key
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: write-key
- commands:
- make BUILD_IN_CONTAINER=false packages
environment:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: test packaging
- commands:
- ./tools/packaging/verify-deb-install.sh
Expand All @@ -1717,7 +1717,7 @@ steps:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: publish
when:
event:
Expand Down Expand Up @@ -1752,7 +1752,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.33.1
image: grafana/loki-build-image:0.33.5
name: build and push
privileged: true
volumes:
Expand Down Expand Up @@ -2017,6 +2017,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: d8b8157778d7af50fed6a3495772371184d2df57c6940516be68ecdf8cdf5de4
hmac: 058e79893acf667988551423108d008a92686a0f62c4db72d1d961cb6d478c9f

...
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "loki-2.9.x"
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "5a1ae264353c2a87132780efc4fa548769ef53c7",
"sum": "ehDGacNILjqjRolJv4FyRroujA9uXtng/aJYNQmN4Zs="
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56",
"sum": "kVlVZPpPz8d/D6UGK9Hto+NeGy7z8NvGygcB1QboxWw="
}
],
"legacyImports": false
Expand Down
9 changes: 6 additions & 3 deletions .github/release-workflows.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;
local job = lokiRelease.job;

local releaseLibRef = 'loki-2.9.x';
local releaseLibRef = std.filter(
function(dep) dep.source.git.remote == 'https://github.com/grafana/loki-release.git',
(import 'jsonnetfile.json').dependencies
)[0].version;
local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;

local imageJobs = {
Expand All @@ -17,8 +20,8 @@ local imageJobs = {
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
};

local buildImage = 'grafana/loki-build-image:0.30.1';
local golangCiLintVersion = 'v1.51.2';
local buildImage = 'grafana/loki-build-image:0.33.5';
local golangCiLintVersion = 'v1.55.1';

local imageBuildTimeoutMin = 40;
local imagePrefix = 'grafana';
Expand Down
Loading
Loading