build: change copyDockerfile output path (#1458)

eclipse-tractusx · Jul 24, 2024 · 2956ac8 · 2956ac8
1 parent 8a5aa9d
commit 2956ac8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
@@ -102,7 +102,7 @@ runs:
       uses: docker/build-push-action@v3
       with:
         context: .
-        file: ${{ inputs.rootDir }}/build/Dockerfile
+        file: ${{ inputs.rootDir }}/build/resources/docker/Dockerfile
         build-args: |
           JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar
           OTEL_JAR=${{ inputs.rootDir }}/opentelemetry-javaagent.jar

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -183,7 +183,7 @@ subprojects {
 
             val copyDockerfile = tasks.create("copyDockerfile", Copy::class) {
                 from(rootProject.projectDir.toPath().resolve("resources"))
-                into(project.layout.buildDirectory)
+                into(project.layout.buildDirectory.dir("resources").get().dir("docker"))
                 include("Dockerfile")
             }
             shadowJarTask.dependsOn(copyDockerfile)
@@ -192,7 +192,7 @@ subprojects {
             apply(plugin = "com.bmuschko.docker-remote-api")
 
             val dockerTask: DockerBuildImage = tasks.create("dockerize", DockerBuildImage::class) {
-                dockerFile.set(project.layout.buildDirectory.asFile.get().toPath().resolve("Dockerfile").toFile())
+                dockerFile.set(project.layout.buildDirectory.asFile.get().toPath().resolve("resources").resolve("docker").resolve("Dockerfile").toFile())
 
                 val dockerContextDir = project.projectDir
                 images.add("${project.name}:${project.version}")