Merge branch '2.7.x' into 3.0.x

pull/35377/head
Phillip Webb 2 years ago
commit 60a53633c7

@ -20,6 +20,7 @@ anchors:
DOCKER_HUB_MIRROR: ((docker-hub-mirror)) DOCKER_HUB_MIRROR: ((docker-hub-mirror))
DOCKER_HUB_USERNAME: ((docker-hub-username)) DOCKER_HUB_USERNAME: ((docker-hub-username))
DOCKER_HUB_PASSWORD: ((docker-hub-password)) DOCKER_HUB_PASSWORD: ((docker-hub-password))
DOCKER_HUB_AUTH: ((docker-hub-auth))
github-task-params: &github-task-params github-task-params: &github-task-params
GITHUB_REPO: spring-boot GITHUB_REPO: spring-boot
GITHUB_ORGANIZATION: spring-projects GITHUB_ORGANIZATION: spring-projects

@ -20,8 +20,12 @@ params:
run: run:
path: bash path: bash
args: args:
- -ec - "-ec"
- | - |
mkdir -p /root/.docker
cat > /root/.docker/config.json <<EOF
{ "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
EOF
source /docker-lib.sh source /docker-lib.sh
start_docker $DOCKER_HUB_MIRROR start_docker $DOCKER_HUB_MIRROR
${PWD}/git-repo/ci/scripts/build-project.sh ${PWD}/git-repo/ci/scripts/build-project.sh

Loading…
Cancel
Save