Skip to content

Commit 7457ed7

Browse files
feloyfeloy
authored
Fix default value of buildContext to PROJECT_SOURCE (#692)
* 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]>
1 parent 48ebbf1 commit 7457ed7

19 files changed

+71
-71
lines changed

‎crds/workspace.devfile.io_devworkspaces.v1beta1.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,7 +4663,7 @@ spec:
46634663
type: array
46644664
buildContext:
46654665
description: Path of source directory to establish
4666-
build context. Defaults to ${PROJECT_ROOT} in
4666+
build context. Defaults to ${PROJECT_SOURCE} in
46674667
the container
46684668
type: string
46694669
devfileRegistry:
@@ -5466,7 +5466,7 @@ spec:
54665466
buildContext:
54675467
description: Path of source directory
54685468
to establish build context. Defaults
5469-
to ${PROJECT_ROOT} in the container
5469+
to ${PROJECT_SOURCE} in the container
54705470
type: string
54715471
devfileRegistry:
54725472
description: Dockerfile's Devfile Registry
@@ -6397,7 +6397,7 @@ spec:
63976397
type: array
63986398
buildContext:
63996399
description: Path of source directory to establish
6400-
build context. Defaults to ${PROJECT_ROOT}
6400+
build context. Defaults to ${PROJECT_SOURCE}
64016401
in the container
64026402
type: string
64036403
devfileRegistry:
@@ -7223,7 +7223,7 @@ spec:
72237223
buildContext:
72247224
description: Path of source directory
72257225
to establish build context. Defaults
7226-
to ${PROJECT_ROOT} in the container
7226+
to ${PROJECT_SOURCE} in the container
72277227
type: string
72287228
devfileRegistry:
72297229
description: Dockerfile's Devfile

‎crds/workspace.devfile.io_devworkspaces.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4664,7 +4664,7 @@ spec:
46644664
type: array
46654665
buildContext:
46664666
description: Path of source directory to establish
4667-
build context. Defaults to ${PROJECT_ROOT} in
4667+
build context. Defaults to ${PROJECT_SOURCE} in
46684668
the container
46694669
type: string
46704670
devfileRegistry:
@@ -5471,7 +5471,7 @@ spec:
54715471
buildContext:
54725472
description: Path of source directory
54735473
to establish build context. Defaults
5474-
to ${PROJECT_ROOT} in the container
5474+
to ${PROJECT_SOURCE} in the container
54755475
type: string
54765476
devfileRegistry:
54775477
description: Dockerfile's Devfile Registry
@@ -6402,7 +6402,7 @@ spec:
64026402
type: array
64036403
buildContext:
64046404
description: Path of source directory to establish
6405-
build context. Defaults to ${PROJECT_ROOT}
6405+
build context. Defaults to ${PROJECT_SOURCE}
64066406
in the container
64076407
type: string
64086408
devfileRegistry:
@@ -7228,7 +7228,7 @@ spec:
72287228
buildContext:
72297229
description: Path of source directory
72307230
to establish build context. Defaults
7231-
to ${PROJECT_ROOT} in the container
7231+
to ${PROJECT_SOURCE} in the container
72327232
type: string
72337233
devfileRegistry:
72347234
description: Dockerfile's Devfile

‎crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4420,7 +4420,7 @@ spec:
44204420
type: array
44214421
buildContext:
44224422
description: Path of source directory to establish build
4423-
context. Defaults to ${PROJECT_ROOT} in the container
4423+
context. Defaults to ${PROJECT_SOURCE} in the container
44244424
type: string
44254425
devfileRegistry:
44264426
description: Dockerfile's Devfile Registry source
@@ -5198,7 +5198,7 @@ spec:
51985198
type: array
51995199
buildContext:
52005200
description: Path of source directory to establish
5201-
build context. Defaults to ${PROJECT_ROOT}
5201+
build context. Defaults to ${PROJECT_SOURCE}
52025202
in the container
52035203
type: string
52045204
devfileRegistry:
@@ -6090,7 +6090,7 @@ spec:
60906090
type: array
60916091
buildContext:
60926092
description: Path of source directory to establish
6093-
build context. Defaults to ${PROJECT_ROOT} in
6093+
build context. Defaults to ${PROJECT_SOURCE} in
60946094
the container
60956095
type: string
60966096
devfileRegistry:
@@ -6886,7 +6886,7 @@ spec:
68866886
buildContext:
68876887
description: Path of source directory
68886888
to establish build context. Defaults
6889-
to ${PROJECT_ROOT} in the container
6889+
to ${PROJECT_SOURCE} in the container
68906890
type: string
68916891
devfileRegistry:
68926892
description: Dockerfile's Devfile Registry

‎crds/workspace.devfile.io_devworkspacetemplates.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4421,7 +4421,7 @@ spec:
44214421
type: array
44224422
buildContext:
44234423
description: Path of source directory to establish build
4424-
context. Defaults to ${PROJECT_ROOT} in the container
4424+
context. Defaults to ${PROJECT_SOURCE} in the container
44254425
type: string
44264426
devfileRegistry:
44274427
description: Dockerfile's Devfile Registry source
@@ -5203,7 +5203,7 @@ spec:
52035203
type: array
52045204
buildContext:
52055205
description: Path of source directory to establish
5206-
build context. Defaults to ${PROJECT_ROOT}
5206+
build context. Defaults to ${PROJECT_SOURCE}
52075207
in the container
52085208
type: string
52095209
devfileRegistry:
@@ -6095,7 +6095,7 @@ spec:
60956095
type: array
60966096
buildContext:
60976097
description: Path of source directory to establish
6098-
build context. Defaults to ${PROJECT_ROOT} in
6098+
build context. Defaults to ${PROJECT_SOURCE} in
60996099
the container
61006100
type: string
61016101
devfileRegistry:
@@ -6891,7 +6891,7 @@ spec:
68916891
buildContext:
68926892
description: Path of source directory
68936893
to establish build context. Defaults
6894-
to ${PROJECT_ROOT} in the container
6894+
to ${PROJECT_SOURCE} in the container
68956895
type: string
68966896
devfileRegistry:
68976897
description: Dockerfile's Devfile Registry

‎pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type DockerfileSrc struct {
4343

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

‎pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎schemas/latest/dev-workspace-template-spec.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@
569569
}
570570
},
571571
"buildContext": {
572-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
572+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
573573
"type": "string"
574574
},
575575
"devfileRegistry": {
@@ -1317,7 +1317,7 @@
13171317
}
13181318
},
13191319
"buildContext": {
1320-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
1320+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
13211321
"type": "string"
13221322
},
13231323
"devfileRegistry": {
@@ -2172,7 +2172,7 @@
21722172
}
21732173
},
21742174
"buildContext": {
2175-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
2175+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
21762176
"type": "string"
21772177
},
21782178
"devfileRegistry": {
@@ -2908,7 +2908,7 @@
29082908
}
29092909
},
29102910
"buildContext": {
2911-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
2911+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
29122912
"type": "string"
29132913
},
29142914
"devfileRegistry": {

‎schemas/latest/dev-workspace-template.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
}
736736
},
737737
"buildContext": {
738-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
738+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
739739
"type": "string"
740740
},
741741
"devfileRegistry": {
@@ -1483,7 +1483,7 @@
14831483
}
14841484
},
14851485
"buildContext": {
1486-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
1486+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
14871487
"type": "string"
14881488
},
14891489
"devfileRegistry": {
@@ -2338,7 +2338,7 @@
23382338
}
23392339
},
23402340
"buildContext": {
2341-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
2341+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
23422342
"type": "string"
23432343
},
23442344
"devfileRegistry": {
@@ -3074,7 +3074,7 @@
30743074
}
30753075
},
30763076
"buildContext": {
3077-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
3077+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
30783078
"type": "string"
30793079
},
30803080
"devfileRegistry": {

‎schemas/latest/dev-workspace.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@
748748
}
749749
},
750750
"buildContext": {
751-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
751+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
752752
"type": "string"
753753
},
754754
"devfileRegistry": {
@@ -1496,7 +1496,7 @@
14961496
}
14971497
},
14981498
"buildContext": {
1499-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
1499+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
15001500
"type": "string"
15011501
},
15021502
"devfileRegistry": {
@@ -2351,7 +2351,7 @@
23512351
}
23522352
},
23532353
"buildContext": {
2354-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
2354+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
23552355
"type": "string"
23562356
},
23572357
"devfileRegistry": {
@@ -3087,7 +3087,7 @@
30873087
}
30883088
},
30893089
"buildContext": {
3090-
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container",
3090+
"description": "Path of source directory to establish build context. Defaults to ${PROJECT_SOURCE} in the container",
30913091
"type": "string"
30923092
},
30933093
"devfileRegistry": {

0 commit comments

Comments
 (0)