From 56d940372eafe80ccf47584b73f7bfe11b0a8b49 Mon Sep 17 00:00:00 2001
From: Eguo Wang <wangeguo@gmail.com>
Date: Fri, 22 Sep 2023 17:37:55 +0800
Subject: [PATCH] Upgrade dockerfile runtime version cc-debian-12

---
 Cargo.lock             | 10 +++++-----
 Cargo.toml             |  3 ++-
 apiserver/Dockerfile   |  2 +-
 controllers/Dockerfile |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36d3296..492ff89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -61,7 +61,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "amp-apiserver"
-version = "0.4.11"
+version = "0.4.12"
 dependencies = [
  "amp-common",
  "amp-resources",
@@ -122,7 +122,7 @@ dependencies = [
 
 [[package]]
 name = "amp-controllers"
-version = "0.4.11"
+version = "0.4.12"
 dependencies = [
  "amp-common",
  "amp-resolver",
@@ -159,7 +159,7 @@ dependencies = [
 
 [[package]]
 name = "amp-resolver"
-version = "0.4.11"
+version = "0.4.12"
 dependencies = [
  "amp-common",
  "amp-resources",
@@ -173,7 +173,7 @@ dependencies = [
 
 [[package]]
 name = "amp-resources"
-version = "0.4.11"
+version = "0.4.12"
 dependencies = [
  "amp-common",
  "k8s-metrics",
@@ -192,7 +192,7 @@ dependencies = [
 
 [[package]]
 name = "amp-syncer"
-version = "0.4.11"
+version = "0.4.12"
 dependencies = [
  "amp-common",
  "async-nats",
diff --git a/Cargo.toml b/Cargo.toml
index 8565044..864e3bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.4.11"
+version = "0.4.12"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/amphitheatre-app/amphitheatre"
@@ -8,6 +8,7 @@ authors = [
 ]
 
 [workspace]
+resolver = "2"
 members = [
     "apiserver",
     "controllers",
diff --git a/apiserver/Dockerfile b/apiserver/Dockerfile
index f29d3e6..139fc0b 100644
--- a/apiserver/Dockerfile
+++ b/apiserver/Dockerfile
@@ -49,7 +49,7 @@ RUN cargo build --release --bin amp-apiserver
 # the smallest image possible. This often means using a different and smaller
 # image than the one used for building the application, but for illustrative
 # purposes the "base" image is used here.
-FROM gcr.io/distroless/cc:nonroot AS runtime
+FROM gcr.io/distroless/cc-debian12:nonroot AS runtime
 
 # Copy the executable from the "building" stage.
 COPY --from=builder \
diff --git a/controllers/Dockerfile b/controllers/Dockerfile
index 5842f45..ee8d3ba 100644
--- a/controllers/Dockerfile
+++ b/controllers/Dockerfile
@@ -49,7 +49,7 @@ RUN cargo build --release --bin amp-controllers
 # the smallest image possible. This often means using a different and smaller
 # image than the one used for building the application, but for illustrative
 # purposes the "base" image is used here.
-FROM gcr.io/distroless/cc:nonroot AS runtime
+FROM gcr.io/distroless/cc-debian12:nonroot AS runtime
 
 # Copy the executable from the "building" stage.
 COPY --from=builder \