Skip to content

Commit fea534e

Browse files
Merge branch 'stable/0.24' into feat/bump-redis-8.2.2
2 parents 63534e2 + 89dbaef commit fea534e

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- define "cap-app-proxy.resources.configmap-documented-configs" }}
22
argoWorkflowsInsecure: {{ .Values.config.argoWorkflowsInsecure | quote }}
33
clusterChunkSize: {{ .Values.config.clusterChunkSize | quote }}
4-
cors: {{ .Values.global.codefresh.url }}
4+
cors: {{ .Values.config.cors | default .Values.global.codefresh.url }}
55
isConfigurationRuntime: {{ .Values.global.runtime.isConfigurationRuntime | quote }}
66
isExternalArgoCD: {{ .Values.global.runtime.isExternalArgoCD | quote }}
77
runtimeName: {{ required "global.runtime.name is required" .Values.global.runtime.name | quote}}

installer-image/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
FROM golang:1.24.6 AS go-build
1+
FROM golang:1.24.6 AS go-build
22

33
RUN go install github.com/davidrjonas/semver-cli@latest \
44
&& cp $GOPATH/bin/semver-cli /usr/local/bin/
55

6-
#bookworm-slim
7-
FROM debian:12.12-slim
6+
FROM debian:13-slim
87

98
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
109

11-
ARG CF_CLI_VERSION=v0.2.13
10+
ARG CF_CLI_VERSION=v0.2.14
1211
ARG TARGETARCH
1312

1413
RUN apt-get update && apt-get install curl jq -y
@@ -17,6 +16,6 @@ COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli
1716

1817
COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
1918

20-
RUN adduser --shell /bin/bash codefresh
19+
RUN useradd -m -s /bin/bash codefresh
2120
USER codefresh
2221
WORKDIR /home/codefresh

0 commit comments

Comments
 (0)