Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
**/.git/
artifacts/
tests/
vsts/
**/github.com/
**/pkg/
**/bin/
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/monitor-versions.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions CHANGELOG.md

This file was deleted.

34 changes: 0 additions & 34 deletions CodeMaid.config

This file was deleted.

82 changes: 0 additions & 82 deletions Detector.sln

This file was deleted.

37 changes: 5 additions & 32 deletions Oryx.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{33D6DAAC-19A1-43DC-A586-A5F18EE98718}"
ProjectSection(SolutionItems) = preProject
images\build\benv.sh = images\build\benv.sh
images\build\Dockerfile = images\build\Dockerfile
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C0150C21-3EC8-4973-B57C-26BC27A4ED57}"
Expand All @@ -23,17 +22,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oryx.BuildImage.Tests", "te
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{0FEBE7DD-10C0-4650-89E4-69DDB0930C56}"
ProjectSection(SolutionItems) = preProject
build\buildBuildImageBases.sh = build\buildBuildImageBases.sh
build\buildBuildImages.sh = build\buildBuildImages.sh
build\buildBuildpacksImages.sh = build\buildBuildpacksImages.sh
build\buildRunTimeImageBases.sh = build\buildRunTimeImageBases.sh
build\buildRunTimeImages.sh = build\buildRunTimeImages.sh
build\buildSln.sh = build\buildSln.sh
build\constants.yaml = build\constants.yaml
build\testBuildImages.sh = build\testBuildImages.sh
build\testBuildScriptGenerator.sh = build\testBuildScriptGenerator.sh
build\testIntegration.sh = build\testIntegration.sh
build\testRunTimeImages.sh = build\testRunTimeImages.sh
build\generateConstants.sh = build\generateConstants.sh
build\testStartupScriptGenerators.sh = build\testStartupScriptGenerators.sh
build\__variables.sh = build\__variables.sh
EndProjectSection
Expand All @@ -43,35 +33,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
.dockerignore = .dockerignore
.gitattributes = .gitattributes
.gitignore = .gitignore
build.sh = build.sh
CodeMaid.config = CodeMaid.config
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oryx.Tests.Common", "tests\Oryx.Tests.Common\Oryx.Tests.Common.csproj", "{7F1935EF-4F1D-4A08-A1FD-AF2508ADFB53}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oryx.RuntimeImage.Tests", "tests\Oryx.RuntimeImage.Tests\Oryx.RuntimeImage.Tests.csproj", "{2A6CBF09-2040-4FE2-BD60-0BB43B43E2E9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vsts", "vsts", "{D7D9E386-B13E-45FA-8AE6-8FC20CB84974}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{BDB3B191-6F72-4EC8-BD74-D2DEEFDAC99D}"
ProjectSection(SolutionItems) = preProject
vsts\pipelines\buildImageBases.yml = vsts\pipelines\buildImageBases.yml
vsts\pipelines\ci.yml = vsts\pipelines\ci.yml
vsts\pipelines\nightly.yml = vsts\pipelines\nightly.yml
vsts\pipelines\validation.yml = vsts\pipelines\validation.yml
EndProjectSection
EndProject

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildScriptGenerator.Tests", "tests\BuildScriptGenerator.Tests\BuildScriptGenerator.Tests.csproj", "{8D7BC3E8-37BE-4E59-8694-1364E314285A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildScriptGeneratorCli.Tests", "tests\BuildScriptGeneratorCli.Tests\BuildScriptGeneratorCli.Tests.csproj", "{16C061C3-3F6E-43C2-A9CC-3E905322E443}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{4885C6A7-0C9A-406C-89E9-D06A3A03C52D}"
ProjectSection(SolutionItems) = preProject
vsts\scripts\cleanDocker.sh = vsts\scripts\cleanDocker.sh
vsts\scripts\removeDockerArtifacts.sh = vsts\scripts\removeDockerArtifacts.sh
EndProjectSection
EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommonFiles", "CommonFiles", "{7475604B-12AC-4765-9259-505BF742FDEF}"
ProjectSection(SolutionItems) = preProject
src\CommonFiles\AssemblyVersion.proj = src\CommonFiles\AssemblyVersion.proj
Expand Down Expand Up @@ -196,11 +170,10 @@ Global
{D6446227-8F24-4EDC-B170-0A732C071D03} = {7515BF2B-C485-43A0-AB2F-DC761B6AB151}
{7F1935EF-4F1D-4A08-A1FD-AF2508ADFB53} = {7515BF2B-C485-43A0-AB2F-DC761B6AB151}
{2A6CBF09-2040-4FE2-BD60-0BB43B43E2E9} = {7515BF2B-C485-43A0-AB2F-DC761B6AB151}
{D7D9E386-B13E-45FA-8AE6-8FC20CB84974} = {45542CEB-0A3B-42DF-95AE-D13A673D3183}
{BDB3B191-6F72-4EC8-BD74-D2DEEFDAC99D} = {D7D9E386-B13E-45FA-8AE6-8FC20CB84974}

{8D7BC3E8-37BE-4E59-8694-1364E314285A} = {7515BF2B-C485-43A0-AB2F-DC761B6AB151}
{16C061C3-3F6E-43C2-A9CC-3E905322E443} = {7515BF2B-C485-43A0-AB2F-DC761B6AB151}
{4885C6A7-0C9A-406C-89E9-D06A3A03C52D} = {D7D9E386-B13E-45FA-8AE6-8FC20CB84974}

{7475604B-12AC-4765-9259-505BF742FDEF} = {C0150C21-3EC8-4973-B57C-26BC27A4ED57}
{A563B2F8-26B1-4114-AE1C-C9E078BC7754} = {7515BF2B-C485-43A0-AB2F-DC761B6AB151}
{A7605A5F-9C7E-4BAF-BF13-949467DA9351} = {2AA826A1-5647-46B2-9885-20E89050653F}
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ docker run --detach --rm \
## Build Server Invocation
1. Build the Oryx solution
1. ![Build Solutionpng](doc/buildServer/buildSolution.png)
1. Create image with oryx and platform binaries
1. `time build/buildBuildImages.sh -t ltsversion`
1. Create image with oryx and platform binaries (see [images/build/Dockerfiles](./images/build/Dockerfiles/))
1. Run docker to port map, volume mount a directory, specify the image with `oryx build`, and invoke BuildServer
1. ```bash
docker run -it -p 8086:80 \
Expand Down
5 changes: 0 additions & 5 deletions actions/oryx-dockerfile/Dockerfile

This file was deleted.

Loading
Loading