fix: rerorder dockerfile to fix run startup (#35)

Author: aaron-steinfeld

hypertrace-gradle-docker-java-application-plugin/CHANGELOG.md

@@ -51,12 +51,7 @@
 
 - Add support for exposing multiple docker image ports via `ports` config
 
-## [0.9.7]
-
-- Improve docker layering by splitting libraries into 3 layers. From the top down:
-    - Local libraries being built as part of the target gradle build
-    - Organization libraries that satisfy the `orgLibrarySpec` property on the `javaApplication`
-      spec as documented in the README, but do not satisfy the local library criteria.
-    - External libraries, presumed to be any library that does not meet the criteria of either of
-      the above layers.
-- First appeared in 0.9.5, but bugs prevent correct execution until 0.9.7
+## [0.9.9]
+
+- Fix bug introduced in 0.9.8 preventing startup. Docker laying improvements not yet working, so
+  currently equivalent to 0.9.4

hypertrace-gradle-docker-java-application-plugin/src/main/java/org/hypertrace/gradle/docker/HypertraceDockerJavaApplicationPlugin.java

@@ -112,7 +112,7 @@ void createDockerfileTask(Project project, HypertraceDockerJavaApplication javaA
              dockerfile.setGroup(DockerPlugin.TASK_GROUP);
              dockerfile.setDescription("Creates a Dockerfile for the java application");
              dockerfile.from(javaApplication.baseImage.map(From::new));
-             dockerfile.copyFile(relativeScriptPath.map(relativePath -> new CopyFile(relativePath, "run")));
+             dockerfile.workingDir("/app");
              dockerfile.copyFile(provideIfDirectoryExists(dockerfile.getDestDir()
                                                                     .map(dir -> dir.dir(DOCKER_BUILD_CONTEXT_EXTERNAL_LIBS_DIR)))
                  .map(unused -> new CopyFile(DOCKER_BUILD_CONTEXT_EXTERNAL_LIBS_DIR, DOCKER_BUILD_CONTEXT_EXTERNAL_LIBS_DIR)));
@@ -126,12 +126,12 @@ void createDockerfileTask(Project project, HypertraceDockerJavaApplication javaA
                                                                     .map(dir -> dir.dir(DOCKER_BUILD_CONTEXT_RESOURCES_DIR)))
                  .map(unused -> new CopyFile(DOCKER_BUILD_CONTEXT_RESOURCES_DIR, DOCKER_BUILD_CONTEXT_RESOURCES_DIR)));
              dockerfile.copyFile(new CopyFile(DOCKER_BUILD_CONTEXT_CLASSES_DIR, DOCKER_BUILD_CONTEXT_CLASSES_DIR));
+             dockerfile.copyFile(relativeScriptPath.map(relativePath -> new CopyFile(relativePath, "run")));
              dockerfile.arg(COMMIT_SHA_BUILD_ARG + "=unknown");
              String commitShaArgReference = "${" + COMMIT_SHA_BUILD_ARG + "}";
              dockerfile.label(singletonMap("commit_sha", commitShaArgReference));
              dockerfile.environmentVariable("COMMIT_SHA", commitShaArgReference);
              dockerfile.label(javaApplication.maintainer.map(maintainer -> singletonMap("maintainer", maintainer)));
-             dockerfile.workingDir("/app");
              dockerfile.instruction(javaApplication.healthCheck);
              dockerfile.environmentVariable(javaApplication.envVars);
              dockerfile.entryPoint("./run");