Merge pull request #107 from MohamedSabthar/main

Fix bal commands not running in container
ballerina-platform · Oct 6, 2023 · 5033db3 · 5033db3
2 parents 973a466 + fcaa28b
commit 5033db3
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy b/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy
@@ -297,13 +297,12 @@ class BallerinaPlugin implements Plugin<Project> {
                                 ballerinaDockerTag = dockerTag
                             }
                             def balPackWithDocker = """
-                                docker run --rm --net=host --user \$(id -u):\$(id -g) \
+                                docker run --rm --net=host --user root \
                                     -v $parentDirectory:/home/ballerina/$parentDirectory.name \
                                     -v $projectDirectory:/home/ballerina/$parentDirectory.name/$projectDirectory.name \
-                                    -w /home/ballerina \
                                     ballerina/ballerina:$ballerinaDockerTag \
-                                    /bin/sh -c "cd $parentDirectory.name/$projectDirectory.name" && \
-                                    $balJavaDebugParam bal pack --target-dir ${balBuildTarget} ${debugParams}
+                                    /bin/sh -c "cd $parentDirectory.name/$projectDirectory.name && \
+                                    $balJavaDebugParam bal pack --target-dir ${balBuildTarget} ${debugParams}"
                             """
                             if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                                 commandLine 'cmd', '/c', "$balPackWithDocker"
@@ -330,13 +329,12 @@ class BallerinaPlugin implements Plugin<Project> {
                                     ballerinaDockerTag = dockerTag
                                 }
                                 def balTestWithDocker = """
-                                    docker run --rm --net=host --user \$(id -u):\$(id -g) \
+                                    docker run --rm --net=host --user root \
                                         -v $parentDirectory:/home/ballerina/$parentDirectory.name \
                                         -v $projectDirectory:/home/ballerina/$parentDirectory.name/$projectDirectory.name \
-                                        -w /home/ballerina \
                                         ballerina/ballerina:$ballerinaDockerTag \
-                                        /bin/sh -c "cd $parentDirectory.name/$projectDirectory.name" && \
-                                        bal test ${graalvmFlag} ${testCoverageParams} ${groupParams} ${disableGroups} ${debugParams}
+                                        /bin/sh -c "cd $parentDirectory.name/$projectDirectory.name && \
+                                        bal test ${graalvmFlag} ${testCoverageParams} ${groupParams} ${disableGroups} ${debugParams}"
                                 """
                                 if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                                     commandLine 'cmd', '/c', "$balTestWithDocker"
@@ -414,13 +412,12 @@ class BallerinaPlugin implements Plugin<Project> {
                         workingDir project.projectDir
                         environment 'JAVA_OPTS', '-DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true'
                         def balTestWithDocker = """
-                            docker run --rm --net=host --user \$(id -u):\$(id -g) \
+                            docker run --rm --net=host --user root \
                                 -v $parentDirectory:/home/ballerina/$parentDirectory.name \
                                 -v $projectDirectory:/home/ballerina/$parentDirectory.name/$projectDirectory.name \
-                                -w /home/ballerina \
                                 ballerina/ballerina:$ballerinaDockerTag \
-                                /bin/sh -c "cd $parentDirectory.name/$projectDirectory.name" && \
-                                bal test ${graalvmFlag} ${testCoverageParams} ${groupParams} ${disableGroups} ${debugParams}
+                                /bin/sh -c "cd $parentDirectory.name/$projectDirectory.name && \
+                                bal test ${graalvmFlag} ${testCoverageParams} ${groupParams} ${disableGroups} ${debugParams}"
                         """
                         if (buildOnDocker) {
                             if (Os.isFamily(Os.FAMILY_WINDOWS)) {