Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -163,13 +163,17 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui |
| 163 | 163 |
} |
| 164 | 164 |
|
| 165 | 165 |
func parseVersion(s string) (types.BuilderVersion, error) {
|
| 166 |
- if s == "" || s == string(types.BuilderV1) {
|
|
| 166 |
+ if s == "" {
|
|
| 167 | 167 |
return types.BuilderV1, nil |
| 168 | 168 |
} |
| 169 |
- if s == string(types.BuilderBuildKit) {
|
|
| 169 |
+ switch types.BuilderVersion(s) {
|
|
| 170 |
+ case types.BuilderV1: |
|
| 171 |
+ return types.BuilderV1, nil |
|
| 172 |
+ case types.BuilderBuildKit: |
|
| 170 | 173 |
return types.BuilderBuildKit, nil |
| 174 |
+ default: |
|
| 175 |
+ return "", errors.Errorf("invalid version %s", s)
|
|
| 171 | 176 |
} |
| 172 |
- return "", errors.Errorf("invalid version %s", s)
|
|
| 173 | 177 |
} |
| 174 | 178 |
|
| 175 | 179 |
func (br *buildRouter) postPrune(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
| ... | ... |
@@ -205,7 +205,7 @@ const ( |
| 205 | 205 |
// BuilderV1 is the first generation builder in docker daemon |
| 206 | 206 |
BuilderV1 BuilderVersion = "1" |
| 207 | 207 |
// BuilderBuildKit is builder based on moby/buildkit project |
| 208 |
- BuilderBuildKit = "2" |
|
| 208 |
+ BuilderBuildKit BuilderVersion = "2" |
|
| 209 | 209 |
) |
| 210 | 210 |
|
| 211 | 211 |
// ImageBuildResponse holds information |