7 Commits

Author SHA1 Message Date
f5b28f1edb code beautify
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-11-21 09:28:08 +01:00
fe2e5c7144 code beautify
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2023-11-21 09:26:18 +01:00
ed468791b5 change secret names
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-11-20 19:30:11 +01:00
1da911fc13 change secret names
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-11-20 19:27:13 +01:00
3fd8dfd95d nix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-11-20 16:01:58 +01:00
4c2ebc64c5 use kubectl, fix 14
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-11-17 16:41:26 +01:00
b7de1c880e use kubectl, fix 13
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-11-17 16:36:53 +01:00
4 changed files with 13 additions and 8 deletions

2
.gitignore vendored
View File

@ -8,4 +8,6 @@ test
.vscode .vscode
.dccache .dccache
sink/.dccache sink/.dccache
*~
.*~

View File

@ -2,13 +2,15 @@ steps:
build: build:
image: plugins/kaniko image: plugins/kaniko
settings: settings:
repo: gitea.hottis.de/${CI_REPO} repo:
registry: https://gitea.hottis.de/v2/ from_secret: image_name
registry:
from_secret: container_registry
tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG} tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
username: username:
from_secret: system_container_registry_username from_secret: container_registry_username
password: password:
from_secret: system_container_registry_password from_secret: container_registry_password
dockerfile: Dockerfile dockerfile: Dockerfile
when: when:
- event: [push, tag] - event: [push, tag]
@ -18,11 +20,11 @@ steps:
secrets: secrets:
- source: kube_config - source: kube_config
target: KUBE_CONFIG_CONTENT target: KUBE_CONFIG_CONTENT
- source: image_name
target: IMAGE_NAME
commands: commands:
- printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
- export KUBECONFIG=/tmp/kubeconfig - export KUBECONFIG=/tmp/kubeconfig
- cd $CI_WORKSPACE - cat $CI_WORKSPACE/deployment/deploy-yml.tmpl | sed -e 's,%IMAGE%,'$IMAGE_NAME':'$CI_COMMIT_TAG',' | kubectl apply -f -
- pwd
- cat deployment/deploy-yml.tmpl | sed -e 's,%IMAGE%,gitea.hottis.de/'$CI_REPO':'$CI_COMMIT_TAG','
when: when:
- event: tag - event: tag

View File

@ -33,3 +33,4 @@ The projects of the three current variants are at [RPi](https://home.hottis.de/g

View File

@ -301,7 +301,7 @@ void usage() {
printf("https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-rpi,\n"); printf("https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-rpi,\n");
printf("https://github.com/wollud1969/sinkConvert1\n"); printf("https://github.com/wollud1969/sinkConvert1\n");
printf("Repo: https://home.hottis.de/gitlab/wolutator/sinkserver\n"); printf("Repo: https://home.hottis.de/gitlab/wolutator/sinkserver\n");
printf("Version: " VERSION "\n"); printf("Version: " VERSION " XXX\n");
printf("\nUsage\n"); printf("\nUsage\n");
printf(" -f FILENAME ...... Config file to be used\n"); printf(" -f FILENAME ...... Config file to be used\n");
printf(" -v ............... Verbose, writes all logging on stdout too\n"); printf(" -v ............... Verbose, writes all logging on stdout too\n");