docker fixes

Author: omursahin

scripts/build/.env

@@ -0,0 +1,10 @@
+EVOMASTER_VERSION=5.0.3-SNAPSHOT
+DIST_FOLDER=../../dist
+JACOCO_FOLDER=../../jacoco
+JDK_8_MVN_FOLDER=../../jdk_8_maven
+JDK_8_GRADLE_FOLDER=../../jdk_8_gradle
+JDK_11_MVN_FOLDER=../../jdk_11_maven
+JDK_11_GRADLE_FOLDER=../../jdk_11_gradle
+JDK_17_MVN_FOLDER=../../jdk_17_maven
+JDK_17_GRADLE_FOLDER=../../jdk_17_gradle
+JDK_21_MVN_FOLDER=../../jdk_21_maven

Dockerfile.jdk11 scripts/build/Dockerfile.jdk11Dockerfile.jdk11 renamed to scripts/build/Dockerfile.jdk11

@@ -8,8 +8,8 @@ services:
     image: emb-build-jdk8
     volumes:
       - ${HOME}/.m2:/root/.m2
-      - ./dist:/dist
-      - ./jdk_8_maven:/build/jdk_8_maven
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_8_MVN_FOLDER}:/build/jdk_8_maven
     working_dir: /build/jdk_8_maven
     command: >
       bash -c "mvn clean install -DskipTests &&
@@ -77,8 +77,8 @@ services:
     volumes:
       - ${HOME}/.m2:/root/.m2
       - ${HOME}/.gradle:/root/.gradle
-      - ./dist:/dist
-      - ./jdk_8_gradle:/build/jdk_8_gradle
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_8_GRADLE_FOLDER}:/build/jdk_8_gradle
     working_dir: /build/jdk_8_gradle
     command: >
       bash -c "gradle build -x test &&
@@ -93,8 +93,8 @@ services:
     image: emb-build-jdk11
     volumes:
       - ${HOME}/.m2:/root/.m2
-      - ./dist:/dist
-      - ./jdk_11_maven:/build/jdk_11_maven
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_11_MVN_FOLDER}:/build/jdk_11_maven
     working_dir: /build/jdk_11_maven
     command: >
       bash -c "mvn clean install -DskipTests &&
@@ -124,8 +124,8 @@ services:
     volumes:
       - ${HOME}/.m2:/root/.m2
       - ${HOME}/.gradle:/root/.gradle
-      - ./dist:/dist
-      - ./jdk_11_gradle:/build/jdk_11_gradle
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_11_GRADLE_FOLDER}:/build/jdk_11_gradle
     working_dir: /build/jdk_11_gradle
     command: >
       bash -c "gradle build -x test -x spotlessCheck -x spotlessJavaCheck &&
@@ -142,8 +142,8 @@ services:
     image: emb-build-jdk17
     volumes:
       - ${HOME}/.m2:/root/.m2
-      - ./dist:/dist
-      - ./jdk_17_maven:/build/jdk_17_maven
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_17_MVN_FOLDER}:/build/jdk_17_maven
     working_dir: /build/jdk_17_maven
     command: >
       bash -c "mvn clean install -DskipTests &&
@@ -171,8 +171,8 @@ services:
     volumes:
       - ${HOME}/.m2:/root/.m2
       - ${HOME}/.gradle:/root/.gradle
-      - ./dist:/dist
-      - ./jdk_17_gradle:/build/jdk_17_gradle
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_17_GRADLE_FOLDER}:/build/jdk_17_gradle
     working_dir: /build/jdk_17_gradle
     command: >
       bash -c "gradle build -x test -x spotlessCheck -x spotlessJavaCheck &&
@@ -187,8 +187,8 @@ services:
     image: emb-build-jdk21
     volumes:
       - ${HOME}/.m2:/root/.m2
-      - ./dist:/dist
-      - ./jdk_21_maven:/build/jdk_21_maven
+      - ${DIST_FOLDER}:/dist
+      - ${JDK_21_MVN_FOLDER}:/build/jdk_21_maven
     working_dir: /build/jdk_21_maven
     command: >
       bash -c "mvn clean install -DskipTests &&
@@ -206,10 +206,10 @@ services:
     image: alpine:latest
     volumes:
       - ${HOME}/.m2:/root/.m2
-      - ./dist:/dist
-      - ./jacoco:/jacoco
+      - ${DIST_FOLDER}:/dist
+      - ${JACOCO_FOLDER}:/jacoco
     command: >
-      sh -c "cp /root/.m2/repository/org/evomaster/evomaster-client-java-instrumentation/5.0.3-SNAPSHOT/evomaster-client-java-instrumentation-5.0.3-SNAPSHOT.jar /dist/evomaster-agent.jar &&
+      sh -c "cp /root/.m2/repository/org/evomaster/evomaster-client-java-instrumentation/${EVOMASTER_VERSION}/evomaster-client-java-instrumentation-${EVOMASTER_VERSION}.jar /dist/evomaster-agent.jar &&
              cp /jacoco/jacocoagent.jar /dist/ &&
              cp /jacoco/jacococli.jar /dist/ &&
              echo 'Additional files copied'"

Dockerfile.jdk17 scripts/build/Dockerfile.jdk17Dockerfile.jdk17 renamed to scripts/build/Dockerfile.jdk17

@@ -114,7 +114,7 @@ if [ "$COPY_ONLY" = true ]; then
     mkdir -p "$PROJ_DIR/dist"
 
     echo "Copying additional files (evomaster-agent, jacoco)..."
-    $DOCKER_COMPOSE -f docker-compose.build.yml run --rm -T copy-additional-files
+    $DOCKER_COMPOSE -f ./scripts/build/docker-compose.build.yml run --rm -T copy-additional-files
 
     echo ""
     echo "========================================"
@@ -163,8 +163,8 @@ if [ "$JDK_VERSION" == "all" ] && [ "$BUILD_TOOL" == "all" ]; then
     if [[ ! $REPLY =~ ^[Yy]$ ]]; then
         echo ""
         echo "Build cancelled by user."
-        echo "Tip: Use './scripts/docker-dist.sh <JDK> <TOOL>' for incremental builds"
-        echo "     Example: ./scripts/docker-dist.sh 8 gradle"
+        echo "Tip: Use './scripts/dist-docker.sh <JDK> <TOOL>' for incremental builds"
+        echo "     Example: ./scripts/dist-docker.sh 8 gradle"
         exit 0
     fi
 
@@ -279,7 +279,7 @@ else
     echo "Step 1: Building Docker images..."
     UNIQUE_IMAGES=($(printf '%s\n' "${SERVICES_TO_BUILD[@]}" | sed 's/-maven$//' | sed 's/-gradle$//' | sort -u))
     for service in "${SERVICES_TO_BUILD[@]}"; do
-        $DOCKER_COMPOSE -f docker-compose.build.yml build "$service" &
+        $DOCKER_COMPOSE -f ./scripts/build/docker-compose.build.yml build "$service" &
     done
     wait
     echo "All Docker images built!"
@@ -296,7 +296,7 @@ else
         PIDS=()
         for service in "${SERVICES_TO_BUILD[@]}"; do
             echo "Starting: $service"
-            $DOCKER_COMPOSE -f docker-compose.build.yml run --rm -T "$service" &
+            $DOCKER_COMPOSE -f ./scripts/build/docker-compose.build.yml run --rm -T "$service" &
             PIDS+=($!)
         done
 
@@ -330,7 +330,7 @@ else
         # Run builds one by one
         for service in "${SERVICES_TO_BUILD[@]}"; do
             echo ">>> Building: $service"
-            $DOCKER_COMPOSE -f docker-compose.build.yml run --rm -T "$service"
+            $DOCKER_COMPOSE -f ./scripts/build/docker-compose.build.yml run --rm -T "$service"
             if [ $? -ne 0 ]; then
                 echo ""
                 echo "ERROR: $service build failed!"
@@ -345,15 +345,15 @@ else
     echo "Copying Additional Files"
     echo "========================================"
     echo ">>> Copying evomaster-agent and jacoco files to dist..."
-    $DOCKER_COMPOSE -f docker-compose.build.yml run --rm -T copy-additional-files
+    $DOCKER_COMPOSE -f ./scripts/build/docker-compose.build.yml run --rm -T copy-additional-files
     echo "Additional files copied!"
     echo ""
 fi
 
 echo "========================================"
 echo "Cleaning up Docker containers..."
 echo "========================================"
-$DOCKER_COMPOSE -f docker-compose.build.yml down
+$DOCKER_COMPOSE -f ./scripts/build/docker-compose.build.yml down
 
 echo ""
 echo "========================================"

Dockerfile.jdk21 scripts/build/Dockerfile.jdk21Dockerfile.jdk21 renamed to scripts/build/Dockerfile.jdk21

@@ -73,6 +73,11 @@ def replaceInDist():
     replacement = 'EVOMASTER_VERSION = "'+version+'"\n'
     replace("scripts/dist.py", regex, replacement)
 
+def replaceInDockerEnv():
+    regex = re.compile(r'^EVOMASTER_VERSION\s*=\s*.*$')
+    replacement = 'EVOMASTER_VERSION='+version+'\n'
+    replace("scripts/build/.env", regex, replacement)
+
 def replaceInProperty(file):
     regex = re.compile(r'.*EVOMASTER_VERSION.*=.*')
     replacement = 'EVOMASTER_VERSION='+version+'\n'
@@ -139,8 +144,8 @@ def versionSetMaven(folder, jdk_home):
     replaceInGradle("jdk_8_gradle/build.gradle")
     replaceInGradle("jdk_11_gradle/build.gradle")
     replaceInGradle("jdk_17_gradle/build.gradle")
-
     replaceInDist()
+    replaceInDockerEnv()
 
 if target == "wfd":
     versionSetMaven("/jdk_8_maven",JAVA_HOME_8)