Compare commits
2 Commits
84fbf6debc
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
1bc3057819
|
|||
|
5efe14c78a
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -41,7 +41,7 @@ jobs:
|
|||||||
- name: Push to dokku
|
- name: Push to dokku
|
||||||
uses: dokku/github-action@master
|
uses: dokku/github-action@master
|
||||||
with:
|
with:
|
||||||
git_remote_url: 'ssh://dokku@heroku.ctdn.net:2222/spring-web-modules'
|
git_remote_url: 'ssh://dokku@heroku.ctdn.net:2222/spring-web-api-demo'
|
||||||
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
branch: main
|
branch: main
|
||||||
git_push_flags: --force
|
git_push_flags: --force
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ LABEL maintainer="sombochea@cubetiqs.com"
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apk update && apk add git
|
|
||||||
|
|
||||||
COPY gradlew ./
|
COPY gradlew ./
|
||||||
COPY gradle ./gradle
|
COPY gradle ./gradle
|
||||||
RUN ./gradlew
|
RUN ./gradlew
|
||||||
@@ -15,7 +13,6 @@ COPY settings.gradle.kts ./
|
|||||||
COPY build.gradle.kts ./
|
COPY build.gradle.kts ./
|
||||||
COPY api/build.gradle.kts ./api/build.gradle.kts
|
COPY api/build.gradle.kts ./api/build.gradle.kts
|
||||||
COPY api/src ./api/src
|
COPY api/src ./api/src
|
||||||
COPY .git ./.git
|
|
||||||
|
|
||||||
RUN ./gradlew api:bootJar
|
RUN ./gradlew api:bootJar
|
||||||
|
|
||||||
|
|||||||
@@ -8,28 +8,8 @@ plugins {
|
|||||||
kotlin("plugin.jpa")
|
kotlin("plugin.jpa")
|
||||||
}
|
}
|
||||||
|
|
||||||
val kotlinVersion = "1.8.10"
|
|
||||||
val springBootVersion = "3.0.4"
|
|
||||||
|
|
||||||
// find the last commit
|
|
||||||
fun getGitHashLastCommit(): String {
|
|
||||||
val stdout = ByteArrayOutputStream()
|
|
||||||
exec {
|
|
||||||
commandLine("git", "rev-parse", "HEAD")
|
|
||||||
standardOutput = stdout
|
|
||||||
}
|
|
||||||
|
|
||||||
return stdout.toString().trim()
|
|
||||||
}
|
|
||||||
|
|
||||||
springBoot {
|
springBoot {
|
||||||
buildInfo {
|
buildInfo { }
|
||||||
properties {
|
|
||||||
this.additional.put("commitId", getGitHashLastCommit())
|
|
||||||
this.additional.put("springBootVersion", springBootVersion)
|
|
||||||
this.additional.put("kotlinVersion", kotlinVersion)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class IndexController @Autowired constructor(
|
|||||||
service = buildProperties.artifact,
|
service = buildProperties.artifact,
|
||||||
version = buildProperties.version,
|
version = buildProperties.version,
|
||||||
date = buildProperties.time.toString(),
|
date = buildProperties.time.toString(),
|
||||||
commit = buildProperties["commitId"],
|
|
||||||
authors = authors,
|
authors = authors,
|
||||||
)
|
)
|
||||||
return response(response)
|
return response(response)
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ data class ApiInfoResponse(
|
|||||||
val service: String,
|
val service: String,
|
||||||
val version: String,
|
val version: String,
|
||||||
val date: String,
|
val date: String,
|
||||||
val commit: String,
|
|
||||||
val authors: Collection<ApiInfoAuthorResponse> = listOf(),
|
val authors: Collection<ApiInfoAuthorResponse> = listOf(),
|
||||||
) : BaseRequestModel
|
) : BaseRequestModel
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user