Skip to content

Commit

Permalink
Merge pull request #9 from tomoyane/fix-build-action
Browse files Browse the repository at this point in the history
fix build action
  • Loading branch information
tomoyane authored Jan 28, 2024
2 parents cd4762e + b760eae commit 7e929d0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set -e

ver=$(cat build.gradle | grep version | sed 's/version =//g' | sed "s/'//g" | sed -n 1P | sed 's/\"//g' | sed 's/ //g')
ver=$(cat build.gradle | grep pkgVersion | sed 's/def pkgVersion =//g' | sed "s/'//g" | sed -n 1P | sed 's/\"//g' | sed 's/ //g')

./gradlew clean build -x test
docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
docker build -t tomohito/springboot-bestpractice:"${ver}" -t tomohito/springboot-bestpractice:latest .
docker build -f docker/Dockerfile.app -t tomohito/springboot-bestpractice:"${ver}" -t tomohito/springboot-bestpractice:latest .
docker push tomohito/springboot-bestpractice
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

def pkgName = 'com.bestpractice.api'
def pkgVersion = "1.0.0"
def pkgVersion = "1.1.0"
def javaVersion = project.hasProperty('javaVersion') ? project.getProperty('javaVersion') : '17'
def artifactId = 'spring-boot-bestpractice'

Expand Down

0 comments on commit 7e929d0

Please sign in to comment.