Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 13:09:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(gradle) Add task alias 'docker' for 'jibDockerBuild'

Browse Source 
The change also moves the jib boilerplate to an include.
This commit is contained in:
Viktor Lofgren 2024-02-28 11:59:15 +01:00
parent 37ae8cb33c
commit 20fc0ef13c
11 changed files with 29 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/services-application/api-service/build.gradle
View File

@ -19,23 +19,8 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
apply from: "$rootProject.projectDir/srcsets.gradle"
apply from: "$rootProject.projectDir/docker.gradle"
dependencies {
implementation project(':code:common:db')

16
code/services-application/dating-service/build.gradle
View File

@ -13,21 +13,7 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
apply from: "$rootProject.projectDir/docker.gradle"
java {

16
code/services-application/explorer-service/build.gradle
View File

@ -13,21 +13,7 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
apply from: "$rootProject.projectDir/docker.gradle"
java {

16
code/services-application/search-service/build.gradle
View File

@ -8,21 +8,6 @@ plugins {
id 'com.google.cloud.tools.jib' version '3.4.0'
}
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
application {
mainClass = 'nu.marginalia.search.SearchMain'
applicationName = 'search-service'
@ -43,6 +28,7 @@ sass {
}
apply from: "$rootProject.projectDir/srcsets.gradle"
apply from: "$rootProject.projectDir/docker.gradle"
dependencies {
implementation project(':code:common:db')

18
code/services-core/assistant-service/build.gradle
View File

@ -13,23 +13,6 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
@ -37,6 +20,7 @@ java {
}
apply from: "$rootProject.projectDir/srcsets.gradle"
apply from: "$rootProject.projectDir/docker.gradle"
dependencies {
implementation project(':third-party:symspell')

16
code/services-core/control-service/build.gradle
View File

@ -18,21 +18,7 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
apply from: "$rootProject.projectDir/docker.gradle"
apply from: "$rootProject.projectDir/srcsets.gradle"

17
code/services-core/executor-service/build.gradle
View File

@ -13,20 +13,7 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
java {
toolchain {
@ -35,7 +22,7 @@ java {
}
apply from: "$rootProject.projectDir/srcsets.gradle"
apply from: "$rootProject.projectDir/docker.gradle"
dependencies {
// These look weird but they're needed to be able to spawn the processes
// from the executor service

16
code/services-core/index-service/build.gradle
View File

@ -13,21 +13,7 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = [ rootProject.ext.dockerImageTag ]
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
apply from: "$rootProject.projectDir/docker.gradle"
java {

16
code/services-core/query-service/build.gradle
View File

@ -13,21 +13,7 @@ application {
tasks.distZip.enabled = false
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
apply from: "$rootProject.projectDir/docker.gradle"
java {

16
code/tools/screenshot-capture-tool/build.gradle
View File

@ -17,25 +17,11 @@ application {
applicationName = 'screenshot-capture-tool'
}
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
tasks.distZip.enabled = false
apply from: "$rootProject.projectDir/srcsets.gradle"
apply from: "$rootProject.projectDir/docker.gradle"
dependencies {
implementation project(':code:common:model')

18
docker.gradle Normal file
View File

@ -0,0 +1,18 @@
jib {
from {
image = image = rootProject.ext.dockerImageBase
}
to {
image = rootProject.ext.dockerImageRegistry+'/'+project.name
tags = ['latest']
}
container {
mainClass = application.mainClass
jvmFlags = ['-Dservice.bind-address=0.0.0.0', '-Dservice.useDockerHostname=TRUE', '-Dsystem.homePath=/wmsa']
volumes = ['/wmsa/conf', '/wmsa/model', '/wmsa/data', '/var/log/wmsa']
}
}
tasks.register('docker', {
dependsOn('jibDockerBuild')
})