Skip to content

Commit

Permalink
Merge pull request #81 from credativ/7.5.35
Browse files Browse the repository at this point in the history
7.5.35
  • Loading branch information
ntap-jbolle authored Dec 6, 2024
2 parents 9ea56e2 + 5e78cd7 commit 3e4194a
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.23.2
go-version: 1.23.4
cache: true
cache-dependency-path: |
**/go.sum
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<!-- 7.5.35 START -->

# 7.5.35 (2024-12-06)

- Upgrade Go to 1.23.4
- Upgrade Alpine to 3.21(.0)

<!-- 7.5.35 END -->

<!-- 7.5.34 START -->

# 7.5.34 (2024-10-18)
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV NODE_ENV=production \
RUN yarn build

# Backend builder stage
FROM docker.io/library/golang:1.23.2-alpine3.20 as go-builder
FROM docker.io/library/golang:1.23.4-alpine3.20 as go-builder

RUN apk add --no-cache gcc g++

Expand All @@ -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.20.3 as final
FROM docker.io/library/alpine:3.21.0 as final

ARG PL_UID="472"
ARG PL_GID="0"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ COPY emails emails
ENV NODE_ENV production
RUN yarn build

FROM golang:1.23.2 AS go-builder
FROM golang:1.23.4 AS go-builder

WORKDIR /src/plutono

Expand Down
2 changes: 1 addition & 1 deletion devenv/docker/blocks/prometheus_random_data/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile builds an image for a client_golang example.

# Builder image, where we build the example.
FROM golang:1.23.2 AS builder
FROM golang:1.23.4 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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240809071551-5cab200ebcfc
github.com/credativ/vali v0.0.0-20241018131244-0f211976227c
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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/credativ/vali v0.0.0-20240809071551-5cab200ebcfc h1:o1UdnosSmIhIT/rHhsFQ8T+Xm1GyV7dbJsk4njt8lL0=
github.com/credativ/vali v0.0.0-20240809071551-5cab200ebcfc/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA=
github.com/credativ/vali v0.0.0-20241018131244-0f211976227c h1:TTQ6Yju37Nj52Nxj3mc2T1da6HmGYK/vgt5nus6Srss=
github.com/credativ/vali v0.0.0-20241018131244-0f211976227c/go.mod h1:N2kBFZ91qaBBif79xrLtVNCUzMzqH5BEl+kLuaLU9AA=
github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"packages": [
"packages/*"
],
"version": "7.5.34"
"version": "7.5.35"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "Apache-2.0",
"private": true,
"name": "plutono",
"version": "7.5.34",
"version": "7.5.35",
"repository": "github:credativ/plutono",
"scripts": {
"api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/jaeger-ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jaegertracing/jaeger-ui-components",
"version": "7.5.34",
"version": "7.5.35",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -14,8 +14,8 @@
"typescript": "4.1.2"
},
"dependencies": {
"@credativ/plutono-data": "7.5.34",
"@credativ/plutono-ui": "7.5.34",
"@credativ/plutono-data": "7.5.35",
"@credativ/plutono-ui": "7.5.35",
"@types/classnames": "^2.2.7",
"@types/deep-freeze": "^0.1.1",
"@types/hoist-non-react-statics": "^3.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/plutono-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-data",
"version": "7.5.34",
"version": "7.5.35",
"description": "Plutono Data Library",
"keywords": [
"typescript"
Expand Down
2 changes: 1 addition & 1 deletion packages/plutono-e2e-selectors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-e2e-selectors",
"version": "7.5.34",
"version": "7.5.35",
"description": "Plutono End-to-End Test Selectors Library",
"keywords": [
"cli",
Expand Down
4 changes: 2 additions & 2 deletions packages/plutono-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-e2e",
"version": "7.5.34",
"version": "7.5.35",
"description": "Plutono End-to-End Test Library",
"keywords": [
"cli",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"types": "src/index.ts",
"dependencies": {
"@credativ/plutono-e2e-selectors": "7.5.34",
"@credativ/plutono-e2e-selectors": "7.5.35",
"@cypress/webpack-preprocessor": "4.1.3",
"@grafana/tsconfig": "^1.0.0-rc1",
"@mochajs/json-file-reporter": "^1.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/plutono-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-runtime",
"version": "7.5.34",
"version": "7.5.35",
"description": "Plutono Runtime Library",
"keywords": [
"plutono",
Expand All @@ -22,8 +22,8 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@credativ/plutono-data": "7.5.34",
"@credativ/plutono-ui": "7.5.34",
"@credativ/plutono-data": "7.5.35",
"@credativ/plutono-ui": "7.5.35",
"systemjs": "0.20.19",
"systemjs-plugin-css": "0.1.37"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/plutono-toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-toolkit",
"version": "7.5.34",
"version": "7.5.35",
"description": "Plutono Toolkit",
"keywords": [
"plutono",
Expand All @@ -28,8 +28,8 @@
"dependencies": {
"@babel/core": "7.9.0",
"@babel/preset-env": "7.9.0",
"@credativ/plutono-data": "7.5.34",
"@credativ/plutono-ui": "7.5.34",
"@credativ/plutono-data": "7.5.35",
"@credativ/plutono-ui": "7.5.35",
"@grafana/eslint-config": "2.3.0",
"@grafana/tsconfig": "^1.0.0-rc1",
"@types/command-exists": "^1.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/plutono-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"name": "@credativ/plutono-ui",
"version": "7.5.34",
"version": "7.5.35",
"description": "Plutono Components Library",
"keywords": [
"plutono",
Expand All @@ -27,8 +27,8 @@
},
"dependencies": {
"@credativ/plutono-aws-sdk": "0.0.4",
"@credativ/plutono-data": "7.5.34",
"@credativ/plutono-e2e-selectors": "7.5.34",
"@credativ/plutono-data": "7.5.35",
"@credativ/plutono-e2e-selectors": "7.5.35",
"@emotion/core": "10.0.27",
"@grafana/tsconfig": "^1.0.0-rc1",
"@iconscout/react-unicons": "1.1.4",
Expand Down
8 changes: 4 additions & 4 deletions plugins-bundled/internal/input-datasource/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@credativ/plutono-plugins-input-datasource",
"version": "7.5.34",
"version": "7.5.35",
"description": "Input Datasource",
"private": true,
"repository": {
Expand All @@ -16,9 +16,9 @@
"author": "Plutono Team",
"license": "Apache-2.0",
"devDependencies": {
"@credativ/plutono-data": "7.5.34",
"@credativ/plutono-toolkit": "7.5.34",
"@credativ/plutono-ui": "7.5.34"
"@credativ/plutono-data": "7.5.35",
"@credativ/plutono-toolkit": "7.5.35",
"@credativ/plutono-ui": "7.5.35"
},
"volta": {
"node": "12.16.2"
Expand Down

0 comments on commit 3e4194a

Please sign in to comment.