chore: improved build & run configs

.github/workflows/test.yml

@@ -2,8 +2,9 @@ name: Docker Image Test CI
 
 on:
   push:
-    branches-ignore:
-      - main
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
 
 jobs:
   test:

.run/Build App in Container.run.xml

@@ -2,7 +2,8 @@
   <configuration default="false" name="Build App in Container" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="containerName" value="" />
+        <option name="imageTag" value="ports-and-adapters-build" />
+        <option name="containerName" value="ports-and-adapters-build" />
         <option name="portBindings">
           <list>
             <DockerPortBindingImpl>

.run/Run App in Container.run.xml

@@ -2,7 +2,8 @@
   <configuration default="false" name="Run App in Container" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="containerName" value="" />
+        <option name="imageTag" value="ports-and-adapters-run" />
+        <option name="containerName" value="ports-and-adapters-run" />
         <option name="portBindings">
           <list>
             <DockerPortBindingImpl>

.run/Test App in Container.run.xml

@@ -2,7 +2,8 @@
   <configuration default="false" name="Test App in Container" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="containerName" value="" />
+        <option name="imageTag" value="ports-and-adapters-test" />
+        <option name="containerName" value="ports-and-adapters-test" />
         <option name="sourceFilePath" value="Dockerfile.test" />
       </settings>
     </deployment>

Dockerfile

@@ -1,15 +1,16 @@
-FROM eclipse-temurin:19.0.2_7-jdk-alpine as gradle
-RUN apk add --no-cache gradle
+FROM eclipse-temurin:19.0.2_7-jdk-alpine as GRADLE
+COPY *.gradle gradle.* gradlew /src/
+COPY gradle /src/gradle
+WORKDIR /src
+RUN ["./gradlew", "--version"]
 
-FROM gradle as builder
-USER root
-ENV APP_HOME=/builder
-WORKDIR $APP_HOME
-COPY . $APP_HOME
-RUN gradle build --exclude-task test --stacktrace --no-daemon --no-build-cache --parallel
+FROM GRADLE as BUILDER
+VOLUME /tmp
+WORKDIR /src
+COPY . .
+RUN [ "./gradlew", "build", "--exclude-task", "test", "--stacktrace", "--no-daemon", "--parallel"]
 
 FROM eclipse-temurin:19.0.2_7-jre-alpine
-WORKDIR /app
-expose 8080
-COPY --from=builder "/builder/build/libs/ports-and-adapters-0.0.1-SNAPSHOT.jar" .
-CMD ["java", "-jar", "ports-and-adapters-0.0.1-SNAPSHOT.jar"]
+COPY --from=BUILDER ports-and-adapters-0.0.1-SNAPSHOT.jar app.jar
+EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "app.jar"]

Dockerfile.build

@@ -1,9 +1,10 @@
-FROM eclipse-temurin:19.0.2_7-jdk-alpine as gradle
-RUN apk add --no-cache gradle
-
-FROM gradle as builder
+FROM eclipse-temurin:19.0.2_7-jdk-alpine as GRADLE
 USER root
-ENV APP_HOME=/builder
-WORKDIR $APP_HOME
-COPY . $APP_HOME
-RUN gradle gradle dist --exclude-task test --stacktrace --no-daemon --no-build-cache --parallel
+COPY *.gradle gradle.* gradlew /src/
+COPY gradle /src/gradle
+WORKDIR /src
+RUN ["./gradlew", "--version"]
+
+FROM GRADLE
+COPY . .
+ENTRYPOINT [ "./gradlew", "build", "--exclude-task", "test", "--stacktrace", "--no-daemon", "--parallel"]

Dockerfile.test

@@ -1,9 +1,13 @@
-FROM eclipse-temurin:19.0.2_7-jdk-alpine as gradle
-RUN apk add --no-cache gradle
-
-FROM gradle as builder
+FROM eclipse-temurin:19.0.2_7-jdk-alpine as GRADLE
 USER root
-ENV APP_HOME=/builder
-WORKDIR $APP_HOME
-COPY . $APP_HOME
-RUN gradle test --stacktrace --no-daemon --no-build-cache --parallel
+COPY *.gradle gradle.* gradlew /src/
+COPY gradle /src/gradle
+WORKDIR /src
+RUN ["./gradlew", "--version"]
+
+FROM GRADLE as BUILDER
+COPY . .
+RUN ["./gradlew", "clean"]
+
+FROM BUILDER
+ENTRYPOINT [ "./gradlew", "test", "--stacktrace", "--no-daemon", "--parallel"]

gradle.properties

@@ -1,3 +1,2 @@
 org.gradle.caching=true
-org.gradle.configureondemand=true
 org.gradle.parallel=true