From 74f1d66f8cc788cc369426fea86ac03bcd009685 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Fri, 23 Aug 2024 16:51:08 +0800 Subject: [PATCH] Refactor(build-docker.sh): Optimize script --- build-docker.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index 877f249..d615bdb 100644 --- a/build-docker.sh +++ b/build-docker.sh @@ -10,15 +10,15 @@ java -Djarmode=layertools -jar target/*.jar extract --destination target/extract if [[ "${JAR_VERSION}" =~ ^.*SNAPSHOT$ ]] then - docker build -t hub.fatweb.top/oxygen-api:snapshot-latest -t hub.fatweb.top/oxygen-api:$JAR_VERSION -t hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} . - cat "${KEYS_PATH}/docker.password" | docker login hub.fatweb.top -u jenkins --password-stdin - docker push hub.fatweb.top/oxygen-api:snapshot-latest - docker push hub.fatweb.top/oxygen-api:$JAR_VERSION - docker push hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} + docker build -t ${DOCKER_HUB_URL}/oxygen-api:snapshot-latest -t ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION -t ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION-${BUILD_TIME} . + cat "${KEYS_PATH}/docker.password" | docker login ${DOCKER_HUB_URL} -u jenkins --password-stdin + docker push ${DOCKER_HUB_URL}/oxygen-api:snapshot-latest + docker push ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION + docker push ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION-${BUILD_TIME} else - docker build -t hub.fatweb.top/oxygen-api:latest -t hub.fatweb.top/oxygen-api:$JAR_VERSION -t hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} . - cat "${KEYS_PATH}/docker.password" | docker login hub.fatweb.top -u jenkins --password-stdin - docker push hub.fatweb.top/oxygen-api:latest - docker push hub.fatweb.top/oxygen-api:$JAR_VERSION - docker push hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} + docker build -t ${DOCKER_HUB_URL}/oxygen-api:latest -t ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION -t ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION-${BUILD_TIME} . + cat "${KEYS_PATH}/docker.password" | docker login ${DOCKER_HUB_URL} -u jenkins --password-stdin + docker push ${DOCKER_HUB_URL}/oxygen-api:latest + docker push ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION + docker push ${DOCKER_HUB_URL}/oxygen-api:$JAR_VERSION-${BUILD_TIME} fi \ No newline at end of file -- 2.49.1