Skip to content

Commit 0f96e2a

Browse files
committed
chore(charts): change canary app version
1 parent b17c5f6 commit 0f96e2a

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

.woodpecker/chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
commands:
99
- export VERSION=$(sed 's#v##' <<< $CI_COMMIT_TAG)
1010
- export IMAGE_TAG=$([ ! -z $CI_COMMIT_TAG ] && echo \"$VERSION\" || echo \"canary\")
11-
- export APP_VERSION=$([ ! -z $CI_COMMIT_TAG ] && echo $VERSION || echo 1.0.0)
11+
- export APP_VERSION=$([ -z $CI_COMMIT_TAG ] && echo $CI_COMMIT_SHA || echo $VERSION)
1212
- export CHART_VERSION=$([ -z $CI_COMMIT_TAG ] && echo 1.0.0 || echo $VERSION)
1313
- sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/$${CI_REPO_NAME}/values.yaml
1414
- helm package -u charts/$${CI_REPO_NAME} --version $CHART_VERSION --app-version $APP_VERSION
@@ -25,4 +25,4 @@ steps:
2525
- tag
2626

2727
depends_on:
28-
- manifest
28+
- manifest

charts/registry/templates/registry-cronjob-daily.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ spec:
3737
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
3838
{{- else }}
3939
args:
40-
- /bin/boot
41-
- garbage-collect
42-
- $(DRYCC_REGISTRY_CONFIG)
43-
- --dry-run
44-
- --delete-untagged
40+
- /usr/bin/env
41+
- bash
42+
- -ec
43+
- |
44+
# run garbage collect
45+
boot garbage-collect ${DRYCC_REGISTRY_CONFIG} --dry-run --delete-untagged
4546
{{- end }}
4647
{{- include "registry.envs" . | indent 12 }}
4748
{{- end }}

0 commit comments

Comments
 (0)