develop #29

Merged
william merged 33 commits from develop into master 2022-04-20 22:55:05 -04:00
1 changed files with 10 additions and 8 deletions
Showing only changes of commit 8a74dd01ec - Show all commits

View File

@ -10,12 +10,6 @@ global-variables:
CRE_REGISTRY_IMAGE: *docker-registry-repo
CRE_PORT: 9101
CRE_RELEASE: *release
docker-settings: &docker-settings
repo: *docker-registry-repo
username:
from_secret: docker_username
password:
from_secret: docker_password
gradle-image: &gradle-image gradle:7.1-jdk11
alpine-image: &alpine-image alpine:latest
@ -62,7 +56,11 @@ steps:
- GRADLE_VERSION
- JAVA_VERSION
- CRE_VERSION
<<: *docker-settings
repo: *docker-registry-repo
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
branch: develop
event:
@ -79,7 +77,11 @@ steps:
- JAVA_VERSION
build_args:
- CRE_VERSION=${DRONE_TAG}
<<: *docker-settings
repo: *docker-registry-repo
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
event:
- tag