Update from Debian Bullseye to Bookworm (#4025)

kptdev · Aug 22, 2023 · 226fee0 · 226fee0
1 parent 426681e
commit 226fee0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/porch/build/Dockerfile.apiserver b/porch/build/Dockerfile.apiserver
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.20.7-bookworm as builder
 
 WORKDIR /workspace/src
 RUN git clone https://github.com/kubernetes/kubernetes --branch v1.23.2 --depth=1

diff --git a/porch/build/Dockerfile.etcd b/porch/build/Dockerfile.etcd
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.20.7-bookworm as builder
 
 WORKDIR /workspace
 ARG ETCD_VER=v3.5.1

diff --git a/porch/build/Dockerfile.porch b/porch/build/Dockerfile.porch
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.20.7-bookworm as builder
 
 WORKDIR /go/src/github.com/GoogleContainerTools/kpt
 
@@ -53,7 +53,7 @@ COPY porch/func porch/func
 
 RUN cd porch; go build -v -o /porch ./cmd/porch
 
-FROM debian:bullseye
+FROM debian:bookworm-slim
 RUN apt update && apt install -y ca-certificates && apt install -y git && rm -rf /var/lib/apt && rm -rf /var/cache/apt
 COPY --from=builder /porch /porch
 ENTRYPOINT ["/porch"]
diff --git a/porch/controllers/Dockerfile b/porch/controllers/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.20.7-bookworm as builder
 
 WORKDIR /workspace
 COPY go.mod go.sum ./

diff --git a/porch/examples/apps/hello-server/Dockerfile b/porch/examples/apps/hello-server/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.20.7-bookworm as builder
 
 WORKDIR /src
 COPY go.mod go.sum ./

diff --git a/porch/test/Dockerfile b/porch/test/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM golang:1.20.7-bullseye as builder
+FROM golang:1.20.7-bookworm as builder
 
 WORKDIR /go/src/github.com/GoogleContainerTools/kpt
 
@@ -45,7 +45,7 @@ COPY porch/test porch/test
 
 RUN cd porch/test; go build -v -o /git-server ./git
 
-FROM debian:bullseye
+FROM debian:bookworm-slim
 RUN apt update && apt install -y ca-certificates && rm -rf /var/lib/apt && rm -rf /var/cache/apt
 COPY --from=builder /git-server /git-server
 ENTRYPOINT ["/git-server", "--port=8080"]