Skip to content

Commit c5ac443

Browse files
Merge branch 'main' into fix-open-source
2 parents d76ed37 + c0608cd commit c5ac443

File tree

5 files changed

+19
-26
lines changed

5 files changed

+19
-26
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Key features include:
2323

2424
See the [Documentation](https://docs.openedgeplatform.intel.com/edge-manage-docs/main/index.html) to get started using orch-utils.
2525

26-
TODO: Use Make targets before releasing source code.
27-
2826
### Lint
2927

3028
```sh
@@ -111,8 +109,8 @@ To learn how to contribute to the project, see the [Contributor's Guide](https:/
111109
To learn more about the project, its community, and governance, visit the [Edge Orchestrator
112110
Community](https://github.com/open-edge-platform).
113111

114-
For support, start with [Troubleshooting](https://docs.openedgeplatform.intel.com/edge-manage-docs/main/developer_guide/troubleshooting/index.html) or [contact us](https://github.com/open-edge-platfor).
112+
For support, start with [Troubleshooting](https://docs.openedgeplatform.intel.com/edge-manage-docs/main/developer_guide/troubleshooting/index.html) or [contact us](https://github.com/open-edge-platform).
115113

116114
## License
117115

118-
Edge Manageability Framework is licensed under [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0)
116+
Edge Manageability Framework is licensed under [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0).

mage/Magefile.go

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package mage
77

88
import (
99
"fmt"
10+
"os"
1011
"regexp"
1112

1213
"github.com/bitfield/script"
@@ -16,10 +17,20 @@ import (
1617
var PublicCharts = []string{"aws-sm-get-rs-token", "aws-sm-proxy", "oci-secret", "secret-wait", "token-refresh"}
1718
var PublicContainers = []string{"aws-sm-proxy"}
1819

19-
const (
20-
AWSRegion = "us-west-2"
21-
OpenEdgePlatformRegistryRepoURL = "080137407410.dkr.ecr.us-west-2.amazonaws.com"
22-
OpenEdgePlatformRepository = "edge-orch"
20+
var (
21+
AWSRegion = "us-west-2"
22+
OpenEdgePlatformRegistryRepoURL = func() string {
23+
if r := os.Getenv("DOCKER_REGISTRY"); r != "" {
24+
return r
25+
}
26+
return "080137407410.dkr.ecr.us-west-2.amazonaws.com"
27+
}()
28+
OpenEdgePlatformRepository = func() string {
29+
if r := os.Getenv("DOCKER_REPOSITORY"); r != "" {
30+
return r
31+
}
32+
return "edge-orch"
33+
}()
2334
RegistryRepoSubProj = "common"
2435
OpenEdgePlatformContainerRegistry = OpenEdgePlatformRegistryRepoURL + "/" +
2536
OpenEdgePlatformRepository + "/" +

nexus-api-gw/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,4 @@ For support, start with [Troubleshooting](https://github.com/open-edge-platform)
165165

166166
## License
167167

168-
Nexus API Gateway is licensed under Apache 2.0.
169-
170-
[Foundational Platform]: https://literate-adventure-7vjeyem.pages.github.io/developer_guide/foundational_platform/foundational_platform_main.html
168+
Nexus API Gateway is licensed under [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0).

nexus/compiler/example/datamodel/README.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,3 @@
1717
```
1818

1919
DSL example based on https://confluence.eng.vmware.com/pages/viewpage.action?spaceKey=NSBU&title=Nexus+Platform#NexusPlatform-TL;DR;
20-
21-
TODO:
22-
Extend examples with:
23-
1. Link types
24-
- Link1 CustomLinkType `nexus:"link"`
25-
- NamedLink1 CustomLinkType `nexus:"links"`
26-
2. Status type
27-
- status CustomStatusType `nexus:"status"`
28-
3. Custom comments
29-
- rest-api
30-
- version
31-
- validation-endpoints

tenancy-api-mapping/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,4 @@ For support, start with [Troubleshooting](https://github.com/open-edge-platform)
366366
367367
## License
368368
369-
Tenancy API Mapping is licensed under Apache 2.0.
370-
371-
[Foundational Platform]: https://literate-adventure-7vjeyem.pages.github.io/developer_guide/foundational_platform/foundational_platform_main.html
369+
Tenancy API Mapping is licensed under [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0).

0 commit comments

Comments
 (0)