Skip to content

Fix default value of buildContext to PROJECT_SOURCE #692

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

Merged
merged 4 commits into from
Mar 15, 2022
Merged

Fix default value of buildContext to PROJECT_SOURCE #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb93916
Fix default value of buildContext to PROJECTS_ROOT
feloy Feb 16, 2022
02e1671
Run build.sh
feloy Feb 16, 2022
7dbd8aa
change BuildContext default to PROJECT_SOURCE
kadel Mar 8, 2022
fe0cbb3
run build.sh
kadel Mar 8, 2022
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
8 changes: 4 additions & 4 deletions crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4663,7 +4663,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT} in
build context. Defaults to ${PROJECT_SOURCE} in
the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -5466,7 +5466,7 @@ spec:
buildContext:
description: Path of source directory
to establish build context. Defaults
to ${PROJECT_ROOT} in the container
to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile Registry
Expand Down Expand Up @@ -6388,7 +6388,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT}
build context. Defaults to ${PROJECT_SOURCE}
in the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -7214,7 +7214,7 @@ spec:
buildContext:
description: Path of source directory
to establish build context. Defaults
to ${PROJECT_ROOT} in the container
to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile
Expand Down
8 changes: 4 additions & 4 deletions crds/workspace.devfile.io_devworkspaces.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4664,7 +4664,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT} in
build context. Defaults to ${PROJECT_SOURCE} in
the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -5471,7 +5471,7 @@ spec:
buildContext:
description: Path of source directory
to establish build context. Defaults
to ${PROJECT_ROOT} in the container
to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile Registry
Expand Down Expand Up @@ -6393,7 +6393,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT}
build context. Defaults to ${PROJECT_SOURCE}
in the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -7219,7 +7219,7 @@ spec:
buildContext:
description: Path of source directory
to establish build context. Defaults
to ${PROJECT_ROOT} in the container
to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile
Expand Down
8 changes: 4 additions & 4 deletions crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4420,7 +4420,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish build
context. Defaults to ${PROJECT_ROOT} in the container
context. Defaults to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile Registry source
Expand Down Expand Up @@ -5198,7 +5198,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT}
build context. Defaults to ${PROJECT_SOURCE}
in the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -6081,7 +6081,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT} in
build context. Defaults to ${PROJECT_SOURCE} in
the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -6877,7 +6877,7 @@ spec:
buildContext:
description: Path of source directory
to establish build context. Defaults
to ${PROJECT_ROOT} in the container
to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile Registry
Expand Down
8 changes: 4 additions & 4 deletions crds/workspace.devfile.io_devworkspacetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4421,7 +4421,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish build
context. Defaults to ${PROJECT_ROOT} in the container
context. Defaults to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile Registry source
Expand Down Expand Up @@ -5203,7 +5203,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT}
build context. Defaults to ${PROJECT_SOURCE}
in the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -6086,7 +6086,7 @@ spec:
type: array
buildContext:
description: Path of source directory to establish
build context. Defaults to ${PROJECT_ROOT} in
build context. Defaults to ${PROJECT_SOURCE} in
the container
type: string
devfileRegistry:
Expand Down Expand Up @@ -6882,7 +6882,7 @@ spec:
buildContext:
description: Path of source directory
to establish build context. Defaults
to ${PROJECT_ROOT} in the container
to ${PROJECT_SOURCE} in the container
type: string
devfileRegistry:
description: Dockerfile's Devfile Registry
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type DockerfileSrc struct {

// +devfile:getter:generate
type Dockerfile struct {
// Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container
// Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container
// +optional
BuildContext string `json:"buildContext,omitempty"`

Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions schemas/latest/dev-workspace-template-spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -1317,7 +1317,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -2167,7 +2167,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -2903,7 +2903,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down
8 changes: 4 additions & 4 deletions schemas/latest/dev-workspace-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -1483,7 +1483,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -2333,7 +2333,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -3069,7 +3069,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down
8 changes: 4 additions & 4 deletions schemas/latest/dev-workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -1496,7 +1496,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -2346,7 +2346,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -3082,7 +3082,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down
4 changes: 2 additions & 2 deletions schemas/latest/devfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down Expand Up @@ -1374,7 +1374,7 @@
}
},
"buildContext": {
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
"type": "string"
},
"devfileRegistry": {
Expand Down
Loading