Compare commits
4 Commits
v2025.8.14
...
v2025-8-25
Author | SHA1 | Date | |
---|---|---|---|
2e4f3972a9 | |||
5867d499cb | |||
df53404fba | |||
c1d1a2fe46 |
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -33,7 +33,6 @@ pipeline {
|
|||||||
when {
|
when {
|
||||||
anyOf {
|
anyOf {
|
||||||
branch 'master'
|
branch 'master'
|
||||||
branch 'develop'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
@ -55,7 +54,6 @@ pipeline {
|
|||||||
when {
|
when {
|
||||||
anyOf {
|
anyOf {
|
||||||
branch 'master'
|
branch 'master'
|
||||||
branch 'develop'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
|
2
Makefile
2
Makefile
@ -6,7 +6,7 @@ SHELL := /bin/bash
|
|||||||
|
|
||||||
BOUNCER_VERSION ?=
|
BOUNCER_VERSION ?=
|
||||||
GIT_COMMIT := $(shell git rev-parse --short HEAD)
|
GIT_COMMIT := $(shell git rev-parse --short HEAD)
|
||||||
DATE_VERSION := $(shell date +%Y.%-m.%-d)
|
DATE_VERSION := $(shell git show -s --format=%cd --date=format:'%Y-%-m-%d' $(GIT_COMMIT))
|
||||||
FULL_VERSION := v$(DATE_VERSION)-$(GIT_COMMIT)$(if $(shell git diff --stat),-dirty,)
|
FULL_VERSION := v$(DATE_VERSION)-$(GIT_COMMIT)$(if $(shell git diff --stat),-dirty,)
|
||||||
|
|
||||||
DOCKER_IMAGE_NAME ?= reg.cadoles.com/cadoles/bouncer
|
DOCKER_IMAGE_NAME ?= reg.cadoles.com/cadoles/bouncer
|
||||||
|
Reference in New Issue
Block a user