Skip to content

Commit 87498e8

Browse files
authored
fix(backend): upgrade go version to 1.22.12 to fix CVE-2024-45336 (kubeflow#11631)
Signed-off-by: Daniel Dowler <[email protected]>
1 parent 472f877 commit 87498e8

10 files changed

+18
-18
lines changed

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# 1. Build api server application
16-
FROM golang:1.22.10-bookworm as builder
16+
FROM golang:1.22.12-bookworm as builder
1717
RUN apt-get update && apt-get install -y cmake clang musl-dev openssl
1818
WORKDIR /go/src/github.com/kubeflow/pipelines
1919

backend/Dockerfile.cacheserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Dockerfile for building the source code of cache_server
16-
FROM golang:1.22.10-alpine3.21 as builder
16+
FROM golang:1.22.12-alpine3.21 as builder
1717

1818
RUN apk update && apk upgrade && \
1919
apk add --no-cache bash git openssh gcc musl-dev

backend/Dockerfile.conformance

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Dockerfile for building the source code of conformance tests
16-
FROM golang:1.22.10-alpine3.21 as builder
16+
FROM golang:1.22.12-alpine3.21 as builder
1717

1818
RUN apk update && apk upgrade && \
1919
apk add --no-cache bash git openssh gcc musl-dev

backend/Dockerfile.driver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.22.10-alpine3.21 as builder
15+
FROM golang:1.22.12-alpine3.21 as builder
1616

1717
ARG GCFLAGS=""
1818

backend/Dockerfile.launcher

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.22.10-alpine3.21 as builder
15+
FROM golang:1.22.12-alpine3.21 as builder
1616

1717
WORKDIR /go/src/github.com/kubeflow/pipelines
1818

backend/Dockerfile.persistenceagent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.22.10-alpine3.21 as builder
15+
FROM golang:1.22.12-alpine3.21 as builder
1616

1717
WORKDIR /go/src/github.com/kubeflow/pipelines
1818

backend/Dockerfile.scheduledworkflow

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.22.10-alpine3.21 as builder
15+
FROM golang:1.22.12-alpine3.21 as builder
1616

1717
WORKDIR /go/src/github.com/kubeflow/pipelines
1818

backend/Dockerfile.viewercontroller

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.22.10-alpine3.21 as builder
15+
FROM golang:1.22.12-alpine3.21 as builder
1616

1717
RUN apk update && apk upgrade
1818
RUN apk add --no-cache git gcc musl-dev

backend/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ image_all: image_apiserver image_persistence_agent image_cache image_swf image_v
2828

2929
.PHONY: image_apiserver
3030
image_apiserver:
31-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_APISERVER} -f backend/Dockerfile .
31+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_APISERVER} -f backend/Dockerfile .
3232
.PHONY: image_persistence_agent
3333
image_persistence_agent:
34-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_PERSISTENCEAGENT} -f backend/Dockerfile.persistenceagent .
34+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_PERSISTENCEAGENT} -f backend/Dockerfile.persistenceagent .
3535
.PHONY: image_cache
3636
image_cache:
37-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_CACHESERVER} -f backend/Dockerfile.cacheserver .
37+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_CACHESERVER} -f backend/Dockerfile.cacheserver .
3838
.PHONY: image_swf
3939
image_swf:
40-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_SCHEDULEDWORKFLOW} -f backend/Dockerfile.scheduledworkflow .
40+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_SCHEDULEDWORKFLOW} -f backend/Dockerfile.scheduledworkflow .
4141
.PHONY: image_viewer
4242
image_viewer:
43-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_VIEWERCONTROLLER} -f backend/Dockerfile.viewercontroller .
43+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_VIEWERCONTROLLER} -f backend/Dockerfile.viewercontroller .
4444
.PHONY: image_visualization
4545
image_visualization:
46-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_VISUALIZATION} -f backend/Dockerfile.visualization .
46+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_VISUALIZATION} -f backend/Dockerfile.visualization .
4747
.PHONY: image_driver
4848
image_driver:
49-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_DRIVER} -f backend/Dockerfile.driver .
49+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_DRIVER} -f backend/Dockerfile.driver .
5050
.PHONY: image_driver_debug
5151
image_driver_debug:
5252
cd $(MOD_ROOT) && sed -e '/RUN .*go mod download/a\
@@ -56,10 +56,10 @@ image_driver_debug:
5656
COPY --from=builder /go/bin/dlv /bin/dlv\
5757
EXPOSE 2345' \
5858
backend/Dockerfile.driver > backend/Dockerfile.driver-debug
59-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --build-arg GCFLAGS="all=-N -l" -t ${IMG_TAG_DRIVER}:debug -f backend/Dockerfile.driver-debug .
59+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 --build-arg GCFLAGS="all=-N -l" -t ${IMG_TAG_DRIVER}:debug -f backend/Dockerfile.driver-debug .
6060
.PHONY: image_launcher
6161
image_launcher:
62-
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build -t ${IMG_TAG_LAUNCHER} -f backend/Dockerfile.launcher .
62+
cd $(MOD_ROOT) && ${CONTAINER_ENGINE} build --platform linux/amd64 -t ${IMG_TAG_LAUNCHER} -f backend/Dockerfile.launcher .
6363

6464
.PHONY: dev-kind-cluster
6565
dev-kind-cluster:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubeflow/pipelines
22

3-
go 1.22.0
3+
go 1.22.12
44

55
require (
66
github.com/Masterminds/squirrel v0.0.0-20190107164353-fa735ea14f09

0 commit comments

Comments
 (0)