Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: upgrade gradle-docker-plugin version to 9.4.0 #35

Merged
merged 1 commit into from
Oct 31, 2024
Merged

fix: upgrade gradle-docker-plugin version to 9.4.0 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ group = 'to.wetransform'

repositories {
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/"
}
maven {
url 'https://artifactory.wetransform.to/artifactory/local'
}
Expand All @@ -33,7 +36,7 @@ dependencies{
implementation 'org.yaml:snakeyaml:2.2'

// Docker plugin
implementation 'com.bmuschko:gradle-docker-plugin:3.1.0'
implementation 'com.bmuschko:gradle-docker-plugin:9.4.0'

// Encryption library
implementation 'to.wetransform:alice:1.0.0', {
Expand Down
18 changes: 9 additions & 9 deletions src/main/groovy/to/wetransform/gradle/swarm/SwarmComposerPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,18 +895,20 @@ $run"""
dockerFile = new File(tempDir, dFile.name)
inputDir = tempDir
labels = ['sc-stack': sc.stackName, 'sc-setup': sc.setupName, 'sc-build': buildName]
tag = imageTag
images = [imageTag]

//XXX quiet seems to break build
//quiet = quietMode

pull = pullImage

if (customCredentials) {
registryCredentials = new DockerRegistryCredentials()
registryCredentials.url = customCredentials.url
registryCredentials.username = customCredentials.username
registryCredentials.password = customCredentials.password
registryCredentials {
url = customCredentials.url
username = customCredentials.username
password = customCredentials.password
}

}

group 'Build individual image'
Expand All @@ -922,10 +924,8 @@ $run"""
// add push tasks

def pushTask = project.task("push-${sc.stackName}-${sc.setupName}-${buildName}", type: DockerPushImage) {
def sepIndex = imageTag.lastIndexOf(':')

imageName = (sepIndex >= 0) ? imageTag.substring(0, sepIndex) : imageTag
tag = (sepIndex >= 0 && sepIndex + 1 < imageTag.length()) ? imageTag.substring(sepIndex + 1) : ''

images = [imageTag]

group 'Push individual image'
description "Push image for build \"${buildName}\" for stack ${sc.stackName} with setup ${sc.setupName}"
Expand Down
Loading