Adapt to latest conventions.

This commit is contained in:
Michael Lipp 2023-08-09 18:24:57 +02:00
parent c4270caa7b
commit ce07e43529
2 changed files with 14 additions and 14 deletions

View file

@ -33,4 +33,4 @@ jobs:
java-version: '17' java-version: '17'
distribution: 'temurin' distribution: 'temurin'
- name: Push with Gradle - name: Push with Gradle
run: ./gradlew -Pdocker.registry=ghcr.io/${{ github.actor }} pushContainer run: ./gradlew -Pdocker.registry=ghcr.io/${{ github.actor }} pushImages

View file

@ -31,7 +31,7 @@ application {
mainClass = 'org.jdrupes.vmoperator.runner.qemu.Runner' mainClass = 'org.jdrupes.vmoperator.runner.qemu.Runner'
} }
task buildArchContainer(type: Exec) { task buildArchImage(type: Exec) {
dependsOn installDist dependsOn installDist
inputs.files 'src/org/jdrupes/vmoperator/runner/qemu/Containerfile.arch' inputs.files 'src/org/jdrupes/vmoperator/runner/qemu/Containerfile.arch'
@ -39,20 +39,20 @@ task buildArchContainer(type: Exec) {
'-f', 'src/org/jdrupes/vmoperator/runner/qemu/Containerfile.arch', '.' '-f', 'src/org/jdrupes/vmoperator/runner/qemu/Containerfile.arch', '.'
} }
task tagArchContainer(type: Exec) { task tagLatestArchImage(type: Exec) {
dependsOn buildArchContainer dependsOn buildArchImage
commandLine 'podman', 'tag', "${project.name}:${project.version}",\ commandLine 'podman', 'tag', "${project.name}:${project.version}",\
"${project.name}:latest" "${project.name}:latest"
} }
task buildContainer { task buildLatestArchImage {
dependsOn buildArchContainer dependsOn buildArchImage
dependsOn tagArchContainer dependsOn tagLatestArchImage
} }
task pushArchContainer(type: Exec) { task pushArchImage(type: Exec) {
dependsOn buildContainer dependsOn buildArchImage
commandLine 'podman', 'push', '--tls-verify=false', \ commandLine 'podman', 'push', '--tls-verify=false', \
"localhost/${project.name}:${project.version}", \ "localhost/${project.name}:${project.version}", \
@ -60,8 +60,8 @@ task pushArchContainer(type: Exec) {
+ "/${project.name}-arch:${project.version}" + "/${project.name}-arch:${project.version}"
} }
task pushArchContainerAsLatest(type: Exec) { task pushArchLatestImage(type: Exec) {
dependsOn buildContainer dependsOn buildLatestArchImage
commandLine 'podman', 'push', '--tls-verify=false', \ commandLine 'podman', 'push', '--tls-verify=false', \
"localhost/${project.name}:${project.version}", \ "localhost/${project.name}:${project.version}", \
@ -69,8 +69,8 @@ task pushArchContainerAsLatest(type: Exec) {
+ "/${project.name}-arch:latest" + "/${project.name}-arch:latest"
} }
task pushContainer { task pushImages {
dependsOn pushArchContainer dependsOn pushArchImage
dependsOn pushArchContainerAsLatest dependsOn pushArchLatestImage
} }