Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
f5b28f1edb
|
|||
fe2e5c7144
|
|||
ed468791b5
|
|||
1da911fc13
|
|||
3fd8dfd95d
|
|||
4c2ebc64c5
|
|||
b7de1c880e
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -8,4 +8,6 @@ test
|
|||||||
.vscode
|
.vscode
|
||||||
.dccache
|
.dccache
|
||||||
sink/.dccache
|
sink/.dccache
|
||||||
|
*~
|
||||||
|
.*~
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -33,3 +33,4 @@ The projects of the three current variants are at [RPi](https://home.hottis.de/g
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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");
|
||||||
|
Reference in New Issue
Block a user