From 2eaa96b714a4113d6b4a8b986a25c74d80e5d480 Mon Sep 17 00:00:00 2001 From: Jan Bolle <117356303+ntap-jbolle@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:14:24 +0100 Subject: [PATCH] Release 7.5.28 --- CHANGELOG.md | 9 +++++++++ Dockerfile | 4 ++-- go.mod | 4 ++-- go.sum | 6 ++++-- lerna.json | 2 +- package.json | 2 +- packages/jaeger-ui-components/package.json | 2 +- 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 ++++---- 14 files changed, 37 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f386cf1e4d..5fffb84f7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ + + +# 7.5.28 (2024-01-04) + +- New release +- Upgrade Alpine to 3.19 + + + # 7.5.27 (2023-12-07) diff --git a/Dockerfile b/Dockerfile index 75fea4c084..e4a297f728 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.21.5-alpine3.18 as go-builder +FROM docker.io/library/golang:1.21.5-alpine3.19 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.18 as final +FROM docker.io/library/alpine:3.19 as final ARG PL_UID="472" ARG PL_GID="0" diff --git a/go.mod b/go.mod index 482f005da3..d74be4e18c 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-20231207122154-090631475172 + github.com/credativ/vali v0.0.0-20240104104823-875f7a071e32 github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce github.com/davecgh/go-spew v1.1.1 github.com/denisenkom/go-mssqldb v0.0.0-20200910202707-1e08a3fab204 @@ -60,7 +60,7 @@ require ( github.com/linkedin/goavro/v2 v2.10.0 github.com/magefile/mage v1.11.0 github.com/mattn/go-isatty v0.0.12 - github.com/mattn/go-sqlite3 v1.14.16 + github.com/mattn/go-sqlite3 v1.14.19 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f github.com/opentracing/opentracing-go v1.2.0 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/go.sum b/go.sum index 906ae5527c..678a0ae793 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,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-20231207122154-090631475172 h1:WevKFky8VYqdZ0iQpEtpBHzp6V6GeSnXUYYgLxBP920= -github.com/credativ/vali v0.0.0-20231207122154-090631475172/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA= +github.com/credativ/vali v0.0.0-20240104104823-875f7a071e32 h1:5EmrxJKH/F7B1CsCnxI5bGaNM0rOBCTqvg9/I+qbdRI= +github.com/credativ/vali v0.0.0-20240104104823-875f7a071e32/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce h1:pAuTpLhCqC20s2RLhUirfw606jReW+8z2U5EvG+0S7E= github.com/crewjam/saml v0.4.6-0.20201227203850-bca570abb2ce/go.mod h1:/gCaeLf13J8/621RNZ6TaExji/8xCWcn6UmdJ57wURQ= @@ -1199,6 +1199,8 @@ github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/mattn/go-xmlrpc v0.0.3/go.mod h1:mqc2dz7tP5x5BKlCahN/n+hs7OSZKJkS9JsHNBRlrxA= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= diff --git a/lerna.json b/lerna.json index 57e2469346..39ffb45e45 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "packages": [ "packages/*" ], - "version": "7.5.27" + "version": "7.5.28" } diff --git a/package.json b/package.json index c78d33071c..b4fd17a4d8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "private": true, "name": "plutono", - "version": "7.5.27", + "version": "7.5.28", "repository": "github:credativ/plutono", "scripts": { "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js", diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index c852690eb0..bb0c35841b 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.27", + "version": "7.5.28", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", diff --git a/packages/plutono-data/package.json b/packages/plutono-data/package.json index 2d0806ea88..d648820992 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.27", + "version": "7.5.28", "description": "Plutono Data Library", "keywords": [ "typescript" diff --git a/packages/plutono-e2e-selectors/package.json b/packages/plutono-e2e-selectors/package.json index 1e7782bb8f..ce57ee53a8 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.27", + "version": "7.5.28", "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 8c81064370..5226d37444 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.27", + "version": "7.5.28", "description": "Plutono End-to-End Test Library", "keywords": [ "cli", @@ -43,7 +43,7 @@ }, "types": "src/index.ts", "dependencies": { - "@credativ/plutono-e2e-selectors": "7.5.27", + "@credativ/plutono-e2e-selectors": "7.5.28", "@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 674bbe4ee7..ef2452bdc7 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.27", + "version": "7.5.28", "description": "Plutono Runtime Library", "keywords": [ "plutono", @@ -22,8 +22,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@credativ/plutono-data": "7.5.27", - "@credativ/plutono-ui": "7.5.27", + "@credativ/plutono-data": "7.5.28", + "@credativ/plutono-ui": "7.5.28", "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 3cea37cbb3..31dbaddee9 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.27", + "version": "7.5.28", "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.27", - "@credativ/plutono-ui": "7.5.27", + "@credativ/plutono-data": "7.5.28", + "@credativ/plutono-ui": "7.5.28", "@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 cc5001ea30..6b256bb11a 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.27", + "version": "7.5.28", "description": "Plutono Components Library", "keywords": [ "plutono", @@ -27,8 +27,8 @@ }, "dependencies": { "@credativ/plutono-aws-sdk": "0.0.4", - "@credativ/plutono-data": "7.5.27", - "@credativ/plutono-e2e-selectors": "7.5.27", + "@credativ/plutono-data": "7.5.28", + "@credativ/plutono-e2e-selectors": "7.5.28", "@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 c073f6f327..e562b309f9 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.27", + "version": "7.5.28", "description": "Input Datasource", "private": true, "repository": { @@ -16,9 +16,9 @@ "author": "Plutono Team", "license": "Apache-2.0", "devDependencies": { - "@credativ/plutono-data": "7.5.27", - "@credativ/plutono-toolkit": "7.5.27", - "@credativ/plutono-ui": "7.5.27" + "@credativ/plutono-data": "7.5.28", + "@credativ/plutono-toolkit": "7.5.28", + "@credativ/plutono-ui": "7.5.28" }, "volta": { "node": "12.16.2"