Compare commits
2 Commits
b614049d03
...
33185150cc
| Author | SHA1 | Date | |
|---|---|---|---|
| 33185150cc | |||
| 60c91c1ce6 |
@@ -25,6 +25,7 @@ func TestFormatDuration(t *testing.T) {
|
|||||||
{"30min", time.Duration(30 * time.Minute)},
|
{"30min", time.Duration(30 * time.Minute)},
|
||||||
{"1h 30min", time.Duration(90 * time.Minute)},
|
{"1h 30min", time.Duration(90 * time.Minute)},
|
||||||
{"-1h 30min", time.Duration(-90 * time.Minute)},
|
{"-1h 30min", time.Duration(-90 * time.Minute)},
|
||||||
|
{"", 0},
|
||||||
}
|
}
|
||||||
for _, d := range durations {
|
for _, d := range durations {
|
||||||
t.Run(d.name, func(t *testing.T) {
|
t.Run(d.name, func(t *testing.T) {
|
||||||
|
|||||||
8
Backend/sonar-project.properties
Normal file
8
Backend/sonar-project.properties
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
sonar.projectKey=Arbeitszeitmessung
|
||||||
|
sonar.sources=.
|
||||||
|
sonar.exclusions=**/*_test.go
|
||||||
|
|
||||||
|
sonar.tests=.
|
||||||
|
sonar.test.inclusions=**/*_test.go
|
||||||
|
sonar.go.tests.reportPaths=.test/report.json
|
||||||
|
sonar.go.coverage.reportPaths=.test/coverage.out
|
||||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -1,7 +1,7 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
environment {
|
environment {
|
||||||
DOCKER_USERNAME = 'tom'
|
DOCKER_USERNAME = 'jenkins'
|
||||||
DOCKER_PASSWORD = credentials('dgitea_tom')
|
DOCKER_PASSWORD = credentials('gitea_jenkins')
|
||||||
}
|
}
|
||||||
|
|
||||||
agent any
|
agent any
|
||||||
|
|||||||
16
Makefile
16
Makefile
@@ -1,4 +1,5 @@
|
|||||||
DOCKER_USERNAME ?= tom
|
DOCKER_USERNAME ?= tom
|
||||||
|
PACKAGE_OWNER ?= tom
|
||||||
DOCKER_PASSWORD ?= $(shell echo "YOUR_DEFAULT_PASSWORD")
|
DOCKER_PASSWORD ?= $(shell echo "YOUR_DEFAULT_PASSWORD")
|
||||||
IMAGE_REGISTRY ?= git.letsstein.de
|
IMAGE_REGISTRY ?= git.letsstein.de
|
||||||
APPLICATION_NAME ?= arbeitszeit
|
APPLICATION_NAME ?= arbeitszeit
|
||||||
@@ -16,12 +17,12 @@ ifdef JENKINS_HOME
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
_builder:
|
_builder:
|
||||||
docker build --tag ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} -f $(call capitalize, ${_BUILD_ARGS_APP_PART})/Dockerfile $(call capitalize, ${_BUILD_ARGS_APP_PART})
|
docker build --tag ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} -f $(call capitalize, ${_BUILD_ARGS_APP_PART})/Dockerfile $(call capitalize, ${_BUILD_ARGS_APP_PART})
|
||||||
|
|
||||||
_pusher: login_registry
|
_pusher: login_registry
|
||||||
docker push ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT}
|
docker push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT}
|
||||||
docker tag ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
|
docker tag ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
|
||||||
docker push ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
|
docker push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
|
||||||
|
|
||||||
|
|
||||||
build_%:
|
build_%:
|
||||||
@@ -43,5 +44,8 @@ generateFrontend:
|
|||||||
|
|
||||||
|
|
||||||
backend: generateFrontend login_registry
|
backend: generateFrontend login_registry
|
||||||
docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:latest Backend --push
|
docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeit-backend:latest Backend --push
|
||||||
docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:${GIT_COMMIT} Backend --push
|
docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeit-backend:${GIT_COMMIT} Backend --push
|
||||||
|
|
||||||
|
scan:
|
||||||
|
$(MAKE) -C Backend scan
|
||||||
|
|||||||
Reference in New Issue
Block a user