Skip to content
This repository was archived by the owner on Jan 13, 2026. It is now read-only.

Commit e564e6c

Browse files
beni0888beni0888
authored
Merge branch 'main' into dependabot/npm_and_yarn/dashboard/ws-5.2.4
2 parents 411348d + 8d4bd22 commit e564e6c

14 files changed

Lines changed: 98 additions & 110 deletions

File tree

‎.github/workflows/linters.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
go-version: ${{ inputs.golang_version }}
3535
- uses: actions/checkout@v4
36-
- uses: golangci/golangci-lint-action@v4
36+
- uses: golangci/golangci-lint-action@v6
3737
with:
3838
version: latest
3939
args: --timeout=10m

‎cmd/apprepository-controller/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# syntax = docker/dockerfile:1
55

6-
FROM bitnami/golang:1.22.2 as builder
6+
FROM bitnami/golang:1.22.2 AS builder
77
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
88
COPY go.mod go.sum ./
99
COPY pkg pkg

‎cmd/asset-syncer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# syntax = docker/dockerfile:1
55

6-
FROM bitnami/golang:1.22.2 as builder
6+
FROM bitnami/golang:1.22.2 AS builder
77
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
88
COPY go.mod go.sum ./
99
COPY pkg pkg

‎cmd/kubeapps-apis/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# syntax = docker/dockerfile:1
55

6-
FROM bitnami/golang:1.22.2 as builder
6+
FROM bitnami/golang:1.22.2 AS builder
77
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
88
COPY go.mod go.sum ./
99
ARG VERSION="devel"

‎cmd/oci-catalog/Cargo.lock‎

Lines changed: 10 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/oci-catalog/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ clap = { version = "4.5", features = ["derive", "env"] }
1414
env_logger = "0.11"
1515
futures-core = "0.3"
1616
log = "0.4"
17-
prost = "0.13"
17+
prost = "0.12"
1818
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] }
1919
serde = { version = "1.0", features = ["derive"] }
2020
serde_json = "1.0"

‎cmd/oci-catalog/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# syntax = docker/dockerfile:1
55

6-
FROM rust:1.77.1 as builder
6+
FROM rust:1.77.1 AS builder
77

88
WORKDIR /oci-catalog
99
ARG VERSION="devel"

‎cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go‎

Lines changed: 17 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/pinniped-proxy/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# syntax = docker/dockerfile:1
55

6-
FROM rust:1.77.1 as builder
6+
FROM rust:1.77.1 AS builder
77

88
WORKDIR /pinniped-proxy
99
ARG VERSION

0 commit comments

Comments
 (0)