Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
Signed-off-by: Sarthak Sharma <[email protected]>
  • Loading branch information
sarsharma committed Jan 7, 2025
1 parent c3150d0 commit c71f1ae
Show file tree
Hide file tree
Showing 44 changed files with 92,756 additions and 96,559 deletions.
2 changes: 1 addition & 1 deletion images/runtime/python/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"Component": {
"pip": {
"Name": "orjson",
"Version": "3.9.15"
"Version": "3.6.6"
},
"Type": "pip"
},
Expand Down
4 changes: 2 additions & 2 deletions src/BuildScriptGenerator/Python/PythonBashBuildSnippet.sh.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ fi
then
set +e
echo "Running pip install poetry..."
InstallPipCommand="pip install poetry"
InstallPipCommand="pip install poetry==1.8.5"
printf %s " , $InstallPipCommand" >> "$COMMAND_MANIFEST_FILE"
pip install poetry
pip install poetry==1.8.5
echo "Running poetry install..."
InstallPoetryCommand="poetry install --no-dev"
printf %s " , $InstallPoetryCommand" >> "$COMMAND_MANIFEST_FILE"
Expand Down
6 changes: 2 additions & 4 deletions tests/Oryx.BuildImage.Tests/Node/NodeAppOutputDirTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@ public NodeAppOutputDirTest(ITestOutputHelper output) : base(output)
public void BuildsApp_AndAddsOutputDirToManifestFile(string appName, string expectedOutputDirPath)
{
// Arrange
var version = "20.11.0";
var volume = DockerVolume.CreateMirror(
Path.Combine(_hostSamplesDir, "nodejs", appName));
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/output";
var script = new ShellScriptBuilder()
.AddCommand("node -v")
.AddBuildCommand($"{appDir} -i /tmp/int -o {appOutputDir} --platform {NodeConstants.PlatformName} --platform-version {version}")
.AddBuildCommand($"{appDir} -i /tmp/int -o {appOutputDir}")
.AddFileExistsCheck($"{appOutputDir}/{FilePaths.OsTypeFileName}")
.AddStringExistsInFileCheck(
$"{NodeManifestFilePropertyKeys.OutputDirPath}=\"{expectedOutputDirPath}\"",
Expand All @@ -53,7 +51,7 @@ public void BuildsApp_AndAddsOutputDirToManifestFile(string appName, string expe
// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetAzureFunctionsJamStackBuildImage(ImageTestHelperConstants.AzureFunctionsJamStackBullseye),
ImageId = _imageHelper.GetAzureFunctionsJamStackBuildImage(),
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c71f1ae

Please sign in to comment.