Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement agreed-on devfile 2.0 issues #35

Merged
merged 16 commits into from
Apr 22, 2020
Merged

Implement agreed-on devfile 2.0 issues #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2a3a2c5
Implement agreement on issue #18
davidfestal Apr 3, 2020
515a430
Implement agreement on issue #17
davidfestal Apr 3, 2020
8bceda9
Implement agreement on issue #21
davidfestal Apr 3, 2020
680c4cb
Implement agreement on issue #22
davidfestal Apr 3, 2020
8145b87
Implement agreement on issue #27
davidfestal Apr 3, 2020
6c99166
Implement agreement on issue #9
davidfestal Apr 3, 2020
c766457
Implement agreement on issue #10
davidfestal Apr 7, 2020
636fff6
Fix PR comments about issue #9
davidfestal Apr 10, 2020
04e50e3
Fix PR comments about issue #17
davidfestal Apr 10, 2020
2b3097f
Implement agreement on issue #14 and #19
davidfestal Apr 10, 2020
2fa17a9
Add the spring boot example
davidfestal Apr 10, 2020
bbb2bbf
Implement agreement on issue #32
davidfestal Apr 10, 2020
e0b9a38
Fix last PR comments
davidfestal Apr 22, 2020
5b45b98
Update devfile-support/samples/simple-devfile.yaml
davidfestal Apr 22, 2020
4a7d642
Fix PR comments
davidfestal Apr 22, 2020
6b5f1ff
Fix an error in the Go source
davidfestal Apr 22, 2020
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
3 changes: 2 additions & 1 deletion devfile-support/samples/custom-devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: "my-devfile"
schemaVersion: "2.0.0-beta"
metadata:
name: "my-devfile"
projects:
- name: "my-project"
custom:
Expand Down
3 changes: 2 additions & 1 deletion devfile-support/samples/nodejs-stack.devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
schemaVersion: 2.0.0
name: nodejs-stack
metadata:
name: nodejs-stack
projects:
- name: project
git:
Expand Down
3 changes: 2 additions & 1 deletion devfile-support/samples/sample-devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: "devfile example"
schemaVersion: "2.0.0"
metadata:
name: "devfile example"
davidfestal marked this conversation as resolved.
Show resolved Hide resolved
projects:
- name: "my-project"
custom:
Expand Down
3 changes: 2 additions & 1 deletion devfile-support/samples/simple-devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: "myDevile"
schemaVersion: "2.0.0"
metadata:
name: "myDevile"
projects:
- name: "devworkspace-spec"
git:
Expand Down
3 changes: 2 additions & 1 deletion devfile-support/samples/with-nodejs-parent.devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: with-parent
schemaVersion: 2.0.0
metadata:
name: with-parent
parent:
uri: https://raw.githubusercontent.com/che-incubator/devworkspace-api/proposal-25-variant-1-define-stacks/devfile-support/samples/nodejs-stack.devfile.yaml
commands:
Expand Down
17 changes: 17 additions & 0 deletions devfile-support/transformation-rules/add-name-and-version-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"op": "add",
"path": "/properties/metadata",
"value": { "type": "object", "description": "Optional metadata", "properties": {} }
},
{
"op": "add",
"path": "/properties/metadata/properties/version",
"value": { "type": "string", "description": "Optional semver-compatible version", "pattern": "^([1-9]+)\\.([0-9]+)\\.([0-9]+)(\\-[0-9a-z-]+(\\.[0-9a-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$" }
},
{
"op": "add",
"path": "/properties/metadata/properties/name",
"value": { "type": "string", "description": "Optional devfile name" }
}
]
7 changes: 1 addition & 6 deletions ...formation-rules/add-name-and-version.json → ...ansformation-rules/add-schemaVersion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
"path": "/description",
"value": "Devfile schema."
},
{
"op": "add",
"path": "/properties/name",
"value": { "type": "string", "description": "devfile name" }
},
{
"op": "add",
"path": "/properties/schemaVersion",
Expand All @@ -17,6 +12,6 @@
{
"op": "add",
"path": "/required",
"value": [ "name", "schemaVersion" ]
"value": [ "schemaVersion" ]
}
]
18 changes: 14 additions & 4 deletions schemas/devfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,9 +779,20 @@
},
"type": "array"
},
"name": {
"type": "string",
"description": "devfile name"
"metadata": {
"type": "object",
"description": "Optional metadata",
"properties": {
"version": {
"type": "string",
"description": "Optional semver-compatible version",
"pattern": "^([1-9]+)\\.([0-9]+)\\.([0-9]+)(\\-[0-9a-z-]+(\\.[0-9a-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
davidfestal marked this conversation as resolved.
Show resolved Hide resolved
},
"name": {
"type": "string",
"description": "Optional devfile name"
}
}
},
"schemaVersion": {
"type": "string",
Expand All @@ -791,7 +802,6 @@
},
"type": "object",
"required": [
"name",
"schemaVersion"
]
}