Skip to content

Commit

Permalink
Fix default value of buildContext to PROJECT_SOURCE (#692)
Browse files Browse the repository at this point in the history 
* change BuildContext default to PROJECT_SOURCE

Signed-off-by: Tomas Kral <[email protected]>

* run build.sh

Signed-off-by: Tomas Kral <[email protected]>

Co-authored-by: Philippe Martin <[email protected]>
  • Loading branch information
@feloy
feloy and feloy authored Mar 15, 2022
1 parent 48ebbf1 commit 7457ed7
Show file tree
Hide file tree
Showing 19 changed files with 71 additions and 71 deletions.
8 changes: 4 additions & 4 deletions crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
View file
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 @@ -6397,7 +6397,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 @@ -7223,7 +7223,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
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 @@ -6402,7 +6402,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 @@ -7228,7 +7228,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
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 @@ -6090,7 +6090,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 @@ -6886,7 +6886,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
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 @@ -6095,7 +6095,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 @@ -6891,7 +6891,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
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

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

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
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 @@ -2172,7 +2172,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 @@ -2908,7 +2908,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
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 @@ -2338,7 +2338,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 @@ -3074,7 +3074,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
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 @@ -2351,7 +2351,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 @@ -3087,7 +3087,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
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

0 comments on commit 7457ed7

Please sign in to comment.