Merge branch 'develop' into feature/18-add-existing-files-cache
This commit is contained in:
commit
515ae96fd5
15
.drone.yml
15
.drone.yml
|
@ -6,12 +6,13 @@ global-variables:
|
||||||
GRADLE_VERSION: 7.1
|
GRADLE_VERSION: 7.1
|
||||||
CRE_VERSION: dev-${DRONE_BUILD_NUMBER}
|
CRE_VERSION: dev-${DRONE_BUILD_NUMBER}
|
||||||
CRE_ARTIFACT_NAME: ColorRecipesExplorer
|
CRE_ARTIFACT_NAME: ColorRecipesExplorer
|
||||||
CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/backend
|
CRE_REGISTRY_IMAGE: registry.fyloz.dev/colorrecipesexplorer/backend
|
||||||
CRE_PORT: 9101
|
CRE_PORT: 9101
|
||||||
CRE_RELEASE: *release
|
CRE_RELEASE: *release
|
||||||
gradle-image: &gradle-image gradle:7.1-jdk11
|
gradle-image: &gradle-image gradle:7.1-jdk11
|
||||||
alpine-image: &alpine-image alpine:latest
|
alpine-image: &alpine-image alpine:latest
|
||||||
docker-registry-repo: &docker-registry-repo registry.fyloz.dev:5443/colorrecipesexplorer/backend
|
docker-registry: &docker-registry registry.fyloz.dev
|
||||||
|
docker-registry-repo: &docker-registry-repo registry.fyloz.dev/colorrecipesexplorer/backend
|
||||||
|
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: default
|
name: default
|
||||||
|
@ -56,7 +57,12 @@ steps:
|
||||||
- GRADLE_VERSION
|
- GRADLE_VERSION
|
||||||
- JAVA_VERSION
|
- JAVA_VERSION
|
||||||
- CRE_VERSION
|
- CRE_VERSION
|
||||||
|
registry: *docker-registry
|
||||||
repo: *docker-registry-repo
|
repo: *docker-registry-repo
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
when:
|
when:
|
||||||
branch: develop
|
branch: develop
|
||||||
event:
|
event:
|
||||||
|
@ -73,7 +79,12 @@ steps:
|
||||||
- JAVA_VERSION
|
- JAVA_VERSION
|
||||||
build_args:
|
build_args:
|
||||||
- CRE_VERSION=${DRONE_TAG}
|
- CRE_VERSION=${DRONE_TAG}
|
||||||
|
registry: *docker-registry
|
||||||
repo: *docker-registry-repo
|
repo: *docker-registry-repo
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
when:
|
when:
|
||||||
event:
|
event:
|
||||||
- tag
|
- tag
|
||||||
|
|
Loading…
Reference in New Issue