mirror of
https://github.com/cloudnative-pg/plugin-barman-cloud.git
synced 2026-03-10 20:52:22 +01:00
Compare commits
No commits in common. "fa546eae0581a191abb625904b95d85a65d3ab08" and "e5eb03e1810f720b86451cb808624cbc474f09ff" have entirely different histories.
fa546eae05
...
e5eb03e181
@ -21,7 +21,7 @@ tasks:
|
|||||||
# renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
|
# renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
|
||||||
DAGGER_GOLANGCI_LINT_SHA: 5dcc7e4c4cd5ed230046955f42e27f2166545155
|
DAGGER_GOLANGCI_LINT_SHA: 5dcc7e4c4cd5ed230046955f42e27f2166545155
|
||||||
# renovate: datasource=docker depName=golangci/golangci-lint versioning=semver
|
# renovate: datasource=docker depName=golangci/golangci-lint versioning=semver
|
||||||
GOLANGCI_LINT_VERSION: v2.8.0
|
GOLANGCI_LINT_VERSION: v2.7.2
|
||||||
cmds:
|
cmds:
|
||||||
- >
|
- >
|
||||||
GITHUB_REF= dagger -sc "github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}
|
GITHUB_REF= dagger -sc "github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}
|
||||||
|
|||||||
@ -36,7 +36,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
|
|||||||
# Use plugin-barman-cloud-base to get the dependencies.
|
# Use plugin-barman-cloud-base to get the dependencies.
|
||||||
# pip will build everything inside /usr, so we copy every file into a new
|
# pip will build everything inside /usr, so we copy every file into a new
|
||||||
# destination that will then be copied into the distroless container
|
# destination that will then be copied into the distroless container
|
||||||
FROM ghcr.io/cloudnative-pg/plugin-barman-cloud-base:3.17.0-202601131704 AS pythonbuilder
|
FROM ghcr.io/cloudnative-pg/plugin-barman-cloud-base:3.16.2-202512221525 AS pythonbuilder
|
||||||
# Prepare a new /usr/ directory with the files we'll need in the final image
|
# Prepare a new /usr/ directory with the files we'll need in the final image
|
||||||
RUN mkdir /new-usr/ && \
|
RUN mkdir /new-usr/ && \
|
||||||
cp -r --parents /usr/local/lib/ /usr/lib/*-linux-gnu/ /usr/local/bin/ \
|
cp -r --parents /usr/local/lib/ /usr/lib/*-linux-gnu/ /usr/local/bin/ \
|
||||||
|
|||||||
@ -353,31 +353,30 @@ func reconcilePodSpec(
|
|||||||
sidecarTemplate corev1.Container,
|
sidecarTemplate corev1.Container,
|
||||||
config sidecarConfiguration,
|
config sidecarConfiguration,
|
||||||
) error {
|
) error {
|
||||||
envs := make([]corev1.EnvVar, 0, 5+len(config.env))
|
envs := []corev1.EnvVar{
|
||||||
envs = append(envs,
|
{
|
||||||
corev1.EnvVar{
|
|
||||||
Name: "NAMESPACE",
|
Name: "NAMESPACE",
|
||||||
Value: cluster.Namespace,
|
Value: cluster.Namespace,
|
||||||
},
|
},
|
||||||
corev1.EnvVar{
|
{
|
||||||
Name: "CLUSTER_NAME",
|
Name: "CLUSTER_NAME",
|
||||||
Value: cluster.Name,
|
Value: cluster.Name,
|
||||||
},
|
},
|
||||||
corev1.EnvVar{
|
{
|
||||||
// TODO: should we really use this one?
|
// TODO: should we really use this one?
|
||||||
// should we mount an emptyDir volume just for that?
|
// should we mount an emptyDir volume just for that?
|
||||||
Name: "SPOOL_DIRECTORY",
|
Name: "SPOOL_DIRECTORY",
|
||||||
Value: "/controller/wal-restore-spool",
|
Value: "/controller/wal-restore-spool",
|
||||||
},
|
},
|
||||||
corev1.EnvVar{
|
{
|
||||||
Name: "CUSTOM_CNPG_GROUP",
|
Name: "CUSTOM_CNPG_GROUP",
|
||||||
Value: cluster.GetObjectKind().GroupVersionKind().Group,
|
Value: cluster.GetObjectKind().GroupVersionKind().Group,
|
||||||
},
|
},
|
||||||
corev1.EnvVar{
|
{
|
||||||
Name: "CUSTOM_CNPG_VERSION",
|
Name: "CUSTOM_CNPG_VERSION",
|
||||||
Value: cluster.GetObjectKind().GroupVersionKind().Version,
|
Value: cluster.GetObjectKind().GroupVersionKind().Version,
|
||||||
},
|
},
|
||||||
)
|
}
|
||||||
|
|
||||||
envs = append(envs, config.env...)
|
envs = append(envs, config.env...)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user