File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ environments:
59
59
- os : linux
60
60
compiler : tinygo
61
61
version : latest
62
- docker : tinygo/tinygo:0.25.0
62
+ docker : tinygo/tinygo
63
63
env :
64
64
GOAMD64 : v3
65
65
include : go
Original file line number Diff line number Diff line change @@ -85,8 +85,8 @@ environments:
85
85
# run_cmd: openjdk/bin/java -XX:+UseParallelGC -Xlog:all=off app
86
86
- os : linux
87
87
compiler : openjdk
88
- version : 20
89
- docker : openjdk:20 -slim
88
+ version : 21
89
+ docker : openjdk:21 -slim
90
90
docker_runtime_dir : /usr/local/openjdk-*
91
91
docker_runtime_dir_rename_to : openjdk
92
92
include :
Original file line number Diff line number Diff line change @@ -357,7 +357,7 @@ await ProcessUtils.RunCommandsAsync(
357
357
if ( useDocker )
358
358
{
359
359
const string DockerTmpCodeDir = "/tmp/code" ;
360
- compilerVersionCommand = $ "{ s_dockerCmd } run --rm -v { tmpDir . FullPath } :{ DockerTmpCodeDir } -w { DockerTmpCodeDir } { langEnvConfig . GetEntryPointArgument ( ) } { docker } { compilerVersionCommand } ";
360
+ compilerVersionCommand = $ "{ s_dockerCmd } run --user root -- rm -v { tmpDir . FullPath } :{ DockerTmpCodeDir } -w { DockerTmpCodeDir } { langEnvConfig . GetEntryPointArgument ( ) } { docker } { compilerVersionCommand } ";
361
361
}
362
362
else
363
363
{
@@ -422,7 +422,7 @@ await ProcessUtils.RunCommandAsync(
422
422
additionalDockerEnv = string . Join ( " " , langEnvConfig . Env . Select ( p => $ "--env { p . Key . Trim ( ) } =\" { p . Value . Trim ( ) } \" ") ) ;
423
423
}
424
424
425
- buildCommand = $ "{ s_dockerCmd } run --rm { additonalDockerVolumn } { additionalDockerEnv } -v { tmpDir . FullPath } :{ DockerTmpCodeDir } -w { DockerTmpCodeDir } { langEnvConfig . GetEntryPointArgument ( ) } { docker } { buildCommand . WrapCommandWithShIfNeeded ( ) } ";
425
+ buildCommand = $ "{ s_dockerCmd } run --user root -- rm { additonalDockerVolumn } { additionalDockerEnv } -v { tmpDir . FullPath } :{ DockerTmpCodeDir } -w { DockerTmpCodeDir } { langEnvConfig . GetEntryPointArgument ( ) } { docker } { buildCommand . WrapCommandWithShIfNeeded ( ) } ";
426
426
await ProcessUtils . RunCommandAsync (
427
427
buildCommand ,
428
428
workingDir : tmpDir . FullPath ,
@@ -816,7 +816,7 @@ private static async Task SetupDockerProvidedRuntimeAsync(
816
816
Directory . CreateDirectory ( dir ) ;
817
817
}
818
818
const string DockerTmpDir = "/tmp/runtime" ;
819
- string cmd = $ "{ s_dockerCmd } run --rm -v { dir } :{ DockerTmpDir } -w { DockerTmpDir } { langEnvConfig . GetEntryPointArgument ( ) } { langEnvConfig . Docker } ";
819
+ string cmd = $ "{ s_dockerCmd } run --rm --user root - v { dir } :{ DockerTmpDir } -w { DockerTmpDir } { langEnvConfig . GetEntryPointArgument ( ) } { langEnvConfig . Docker } ";
820
820
if ( ! string . IsNullOrEmpty ( langEnvConfig . DockerRuntimeDir ) )
821
821
{
822
822
var runtimeDir = langEnvConfig . DockerRuntimeDir ;
You can’t perform that action at this time.
0 commit comments