Merge remote-tracking branch 'upstream/master' into add-volume-parameter2
This commit is contained in:
		
						commit
						20f7a8515f
					
				|  | @ -1,4 +1,4 @@ | |||
| # Copyright 2017-2020 The Kubernetes Authors. | ||||
| # Copyright 2023 The Kubernetes Authors. | ||||
| # | ||||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||||
| # you may not use this file except in compliance with the License. | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| FROM --platform=$BUILDPLATFORM golang:1.18 as build-env | ||||
| FROM --platform=$BUILDPLATFORM golang:1.19 as build-env | ||||
| 
 | ||||
| # xx wraps go to automatically configure $GOOS, $GOARCH, and $GOARM | ||||
| # based on TARGETPLATFORM provided by Docker. | ||||
|  | @ -13,7 +13,7 @@ WORKDIR ${APP_FOLDER} | |||
| ARG TARGETPLATFORM | ||||
| RUN CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o /bin/main ./cmd/nfs-subdir-external-provisioner | ||||
| 
 | ||||
| FROM --platform=$TARGETPLATFORM alpine:3.12 | ||||
| FROM --platform=$TARGETPLATFORM alpine:3.18 | ||||
| 
 | ||||
| RUN apk update --no-cache && apk add ca-certificates | ||||
| COPY --from=build-env /bin/main /app/main | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue