From 47eeae4334b9fd738c85efb56927e77816f7fc89 Mon Sep 17 00:00:00 2001 From: Jan Bolle Date: Fri, 10 Jul 2026 09:46:37 +0200 Subject: [PATCH 1/2] Upgrade Alpine to 3.24.1, upgrade Go to 1.26.5 --- .github/workflows/unit-test-backend.yml | 2 +- CHANGELOG.md | 9 +++++++++ Dockerfile | 4 ++-- Dockerfile.ubuntu | 2 +- devenv/docker/blocks/prometheus_random_data/Dockerfile | 2 +- go.mod | 2 +- go.sum | 4 ++-- package.json | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unit-test-backend.yml b/.github/workflows/unit-test-backend.yml index ed72f1a44e..d4133f3a0f 100644 --- a/.github/workflows/unit-test-backend.yml +++ b/.github/workflows/unit-test-backend.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.26.4 + go-version: 1.26.5 cache: true cache-dependency-path: | **/go.sum diff --git a/CHANGELOG.md b/CHANGELOG.md index d5f853be5f..d9d3252367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ + + +# 7.5.50 (2026-07-10) + +- Upgrade Alpine to 3.24.1 +- Upgrade Go to 1.26.5 + + + # 7.5.49 (2026-06-12) diff --git a/Dockerfile b/Dockerfile index 6925c0bdc5..ec367ab920 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ENV NODE_ENV=production \ RUN yarn build # Backend builder stage -FROM docker.io/library/golang:1.26.4-alpine3.24 AS go-builder +FROM docker.io/library/golang:1.26.5-alpine3.24 AS go-builder RUN apk add --no-cache gcc g++ @@ -46,7 +46,7 @@ RUN go run build.go build && \ mv /go/src/github.com/credativ/plutono/bin/linux-$(go env GOARCH)/plutono-cli /go/src/github.com/credativ/plutono/bin/ # Final stage -FROM docker.io/library/alpine:3.24.0 AS final +FROM docker.io/library/alpine:3.24.1 AS final ARG PL_UID="472" ARG PL_GID="0" diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 9f00b6a67d..c8547cb3dd 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -17,7 +17,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.26.4 AS go-builder +FROM golang:1.26.5 AS go-builder WORKDIR /src/plutono diff --git a/devenv/docker/blocks/prometheus_random_data/Dockerfile b/devenv/docker/blocks/prometheus_random_data/Dockerfile index 09114b27b0..91bbb7620e 100644 --- a/devenv/docker/blocks/prometheus_random_data/Dockerfile +++ b/devenv/docker/blocks/prometheus_random_data/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile builds an image for a client_golang example. # Builder image, where we build the example. -FROM golang:1.26.4 AS builder +FROM golang:1.26.5 AS builder # Download prometheus/client_golang/examples/random first RUN go get github.com/prometheus/client_golang/examples/random WORKDIR /go/src/github.com/prometheus/client_golang diff --git a/go.mod b/go.mod index cf22b9e8fa..bcf6e5e0a8 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/centrifugal/centrifuge v0.13.0 github.com/cortexproject/cortex v1.8.1 - github.com/credativ/vali v0.0.0-20260515084411-3567484e575f + github.com/credativ/vali v0.0.0-20260710073934-faf44a72bdef github.com/crewjam/saml v0.4.14 github.com/davecgh/go-spew v1.1.1 github.com/denisenkom/go-mssqldb v0.0.0-20200910202707-1e08a3fab204 diff --git a/go.sum b/go.sum index 7f4bc31ff9..e0daab3316 100644 --- a/go.sum +++ b/go.sum @@ -340,8 +340,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/credativ/vali v0.0.0-20260515084411-3567484e575f h1:9+hKMj0wVzAZhah+OKTHuk2R3bi/uVzgW1A5cuxZ+uU= -github.com/credativ/vali v0.0.0-20260515084411-3567484e575f/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA= +github.com/credativ/vali v0.0.0-20260710073934-faf44a72bdef h1:dH/GcuWYV4wBj6HpXiToROZNJND8oeFSEIonrSvw0WI= +github.com/credativ/vali v0.0.0-20260710073934-faf44a72bdef/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA= github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c= github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME= github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= diff --git a/package.json b/package.json index 1797f35c72..7cbc94520a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "private": true, "name": "plutono", - "version": "7.5.49", + "version": "7.5.50", "repository": "github:credativ/plutono", "scripts": { "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js", From d22b285fc2f90afad17312ac1b3a5daaedef06e3 Mon Sep 17 00:00:00 2001 From: Jan Bolle Date: Fri, 10 Jul 2026 09:48:24 +0200 Subject: [PATCH 2/2] release 7.5.50 --- lerna.json | 2 +- packages/jaeger-ui-components/package.json | 6 +++--- packages/plutono-data/package.json | 2 +- packages/plutono-e2e-selectors/package.json | 2 +- packages/plutono-e2e/package.json | 4 ++-- packages/plutono-runtime/package.json | 6 +++--- packages/plutono-toolkit/package.json | 6 +++--- packages/plutono-ui/package.json | 6 +++--- plugins-bundled/internal/input-datasource/package.json | 8 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lerna.json b/lerna.json index fa295b425b..5955eec81e 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "packages": [ "packages/*" ], - "version": "7.5.49" + "version": "7.5.50" } diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index 15b45cf204..e7fa20aac0 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@jaegertracing/jaeger-ui-components", - "version": "7.5.49", + "version": "7.5.50", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -14,8 +14,8 @@ "typescript": "4.1.2" }, "dependencies": { - "@credativ/plutono-data": "7.5.49", - "@credativ/plutono-ui": "7.5.49", + "@credativ/plutono-data": "7.5.50", + "@credativ/plutono-ui": "7.5.50", "@types/classnames": "^2.2.7", "@types/deep-freeze": "^0.1.1", "@types/hoist-non-react-statics": "^3.3.1", diff --git a/packages/plutono-data/package.json b/packages/plutono-data/package.json index cab0bbeba9..0685649c6a 100644 --- a/packages/plutono-data/package.json +++ b/packages/plutono-data/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-data", - "version": "7.5.49", + "version": "7.5.50", "description": "Plutono Data Library", "keywords": [ "typescript" diff --git a/packages/plutono-e2e-selectors/package.json b/packages/plutono-e2e-selectors/package.json index 7bec59d1b7..5aced5b2b8 100644 --- a/packages/plutono-e2e-selectors/package.json +++ b/packages/plutono-e2e-selectors/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-e2e-selectors", - "version": "7.5.49", + "version": "7.5.50", "description": "Plutono End-to-End Test Selectors Library", "keywords": [ "cli", diff --git a/packages/plutono-e2e/package.json b/packages/plutono-e2e/package.json index ee4c283589..19bc8dad1d 100644 --- a/packages/plutono-e2e/package.json +++ b/packages/plutono-e2e/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-e2e", - "version": "7.5.49", + "version": "7.5.50", "description": "Plutono End-to-End Test Library", "keywords": [ "cli", @@ -43,7 +43,7 @@ }, "types": "src/index.ts", "dependencies": { - "@credativ/plutono-e2e-selectors": "7.5.49", + "@credativ/plutono-e2e-selectors": "7.5.50", "@cypress/webpack-preprocessor": "4.1.3", "@grafana/tsconfig": "^1.0.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", diff --git a/packages/plutono-runtime/package.json b/packages/plutono-runtime/package.json index 66f0f0cd1d..d168efe67b 100644 --- a/packages/plutono-runtime/package.json +++ b/packages/plutono-runtime/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-runtime", - "version": "7.5.49", + "version": "7.5.50", "description": "Plutono Runtime Library", "keywords": [ "plutono", @@ -22,8 +22,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@credativ/plutono-data": "7.5.49", - "@credativ/plutono-ui": "7.5.49", + "@credativ/plutono-data": "7.5.50", + "@credativ/plutono-ui": "7.5.50", "systemjs": "0.20.19", "systemjs-plugin-css": "0.1.37" }, diff --git a/packages/plutono-toolkit/package.json b/packages/plutono-toolkit/package.json index bb647ce05b..c9d53a39f4 100644 --- a/packages/plutono-toolkit/package.json +++ b/packages/plutono-toolkit/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-toolkit", - "version": "7.5.49", + "version": "7.5.50", "description": "Plutono Toolkit", "keywords": [ "plutono", @@ -28,8 +28,8 @@ "dependencies": { "@babel/core": "7.9.0", "@babel/preset-env": "7.9.0", - "@credativ/plutono-data": "7.5.49", - "@credativ/plutono-ui": "7.5.49", + "@credativ/plutono-data": "7.5.50", + "@credativ/plutono-ui": "7.5.50", "@grafana/eslint-config": "2.3.0", "@grafana/tsconfig": "^1.0.0-rc1", "@types/command-exists": "^1.2.0", diff --git a/packages/plutono-ui/package.json b/packages/plutono-ui/package.json index 993676604b..2df035c135 100644 --- a/packages/plutono-ui/package.json +++ b/packages/plutono-ui/package.json @@ -2,7 +2,7 @@ "author": "Plutono Team", "license": "Apache-2.0", "name": "@credativ/plutono-ui", - "version": "7.5.49", + "version": "7.5.50", "description": "Plutono Components Library", "keywords": [ "plutono", @@ -27,8 +27,8 @@ }, "dependencies": { "@credativ/plutono-aws-sdk": "0.0.4", - "@credativ/plutono-data": "7.5.49", - "@credativ/plutono-e2e-selectors": "7.5.49", + "@credativ/plutono-data": "7.5.50", + "@credativ/plutono-e2e-selectors": "7.5.50", "@emotion/core": "10.0.27", "@grafana/tsconfig": "^1.0.0-rc1", "@iconscout/react-unicons": "1.1.4", diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json index ff8f10e22b..8d74b9034e 100644 --- a/plugins-bundled/internal/input-datasource/package.json +++ b/plugins-bundled/internal/input-datasource/package.json @@ -1,6 +1,6 @@ { "name": "@credativ/plutono-plugins-input-datasource", - "version": "7.5.49", + "version": "7.5.50", "description": "Input Datasource", "private": true, "repository": { @@ -16,9 +16,9 @@ "author": "Plutono Team", "license": "Apache-2.0", "devDependencies": { - "@credativ/plutono-data": "7.5.49", - "@credativ/plutono-toolkit": "7.5.49", - "@credativ/plutono-ui": "7.5.49" + "@credativ/plutono-data": "7.5.50", + "@credativ/plutono-toolkit": "7.5.50", + "@credativ/plutono-ui": "7.5.50" }, "volta": { "node": "12.16.2"