update to bookworm-slim (#662)

prasek · web-flow · commit b5f938fc5c91 · 2023-10-04T16:03:50.000-07:00
Signed-off-by: Phil Prasek &lt;prasek@gmail.com&gt;
diff --git a/client/defer/apollo-client/Dockerfile b/client/defer/apollo-client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bullseye-slim
+FROM node:18-bookworm-slim
 
 WORKDIR /usr/src/app
 
diff --git a/misc/advanced/router-dev/Dockerfile b/misc/advanced/router-dev/Dockerfile
@@ -8,9 +8,10 @@ RUN USER=root cargo new --bin acme_router
 WORKDIR /acme_router
 
 # Update our build image and install required packages
-RUN apt-get update
-RUN apt-get -y install \
-    protobuf-compiler
+RUN apt-get update -y \
+    && apt-get install -y \
+    protobuf-compiler \
+    cmake
 
 RUN rustup component add rustfmt
 
@@ -34,9 +35,10 @@ RUN mkdir -p /dist/config && mkdir -p /dist/schema
 #FROM --platform=linux/amd64 gcr.io/distroless/cc-debian11
 
 # if you want bin/sh you'll want a distro that includes it instead
-FROM --platform=linux/amd64 debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bookworm-slim
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update -y \
+    && apt-get install -y \
     ca-certificates \
     curl
 
diff --git a/subgraphs/inventory/Dockerfile b/subgraphs/inventory/Dockerfile
@@ -17,7 +17,7 @@ RUN gradle clean build --no-daemon --parallel
 
 
 # Create a new layer with the build output to run the app
-FROM openjdk:20-slim-bullseye
+FROM openjdk:22-slim-bookworm
 ENV ARTIFACT_NAME=app.jar
 
 WORKDIR /usr/src/app
diff --git a/subgraphs/pandas/Dockerfile b/subgraphs/pandas/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bullseye-slim
+FROM node:18-bookworm-slim
 
 WORKDIR /usr/src/app
 
diff --git a/subgraphs/products/Dockerfile b/subgraphs/products/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bullseye-slim
+FROM node:18-bookworm-slim
 
 WORKDIR /usr/src/app
 
diff --git a/subgraphs/users/Dockerfile b/subgraphs/users/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bullseye-slim
+FROM node:18-bookworm-slim
 
 WORKDIR /usr/src/app
 
diff --git a/supergraph/gateway/Dockerfile b/supergraph/gateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bullseye-slim
+FROM node:18-bookworm-slim
 
 WORKDIR /usr/src/app
 
diff --git a/supergraph/router-rhai-script/Dockerfile b/supergraph/router-rhai-script/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y \
     ca-certificates \
diff --git a/supergraph/router-rust-plugin/Dockerfile b/supergraph/router-rust-plugin/Dockerfile
@@ -8,9 +8,10 @@ RUN USER=root cargo new --bin acme_router
 WORKDIR /acme_router
 
 # Update our build image and install required packages
-RUN apt-get update
-RUN apt-get -y install \
-    protobuf-compiler
+RUN apt-get update -y \
+    && apt-get install -y \
+    protobuf-compiler \
+    cmake
 
 RUN rustup component add rustfmt
 
@@ -34,9 +35,10 @@ RUN mkdir -p /dist/config && mkdir -p /dist/schema
 #FROM --platform=linux/amd64 gcr.io/distroless/cc-debian11
 
 # if you want bin/sh you'll want a distro that includes it instead
-FROM --platform=linux/amd64 debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bookworm-slim
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update -y \
+    && apt-get install -y \
     ca-certificates \
     curl
 
diff --git a/supergraph/schema/docker.graphql b/supergraph/schema/docker.graphql
@@ -1,7 +1,7 @@
 schema
   @link(url: "https://specs.apollo.dev/link/v1.0")
-  @link(url: "https://specs.apollo.dev/join/v0.2", for: EXECUTION)
-  @link(url: "https://specs.apollo.dev/tag/v0.2")
+  @link(url: "https://specs.apollo.dev/join/v0.3", for: EXECUTION)
+  @link(url: "https://specs.apollo.dev/tag/v0.3")
   @link(url: "https://specs.apollo.dev/inaccessible/v0.2", for: SECURITY)
   @link(url: "https://myspecs.dev/myDirective/v1.0", import: ["@myDirective", {name: "@anotherDirective", as: "@hello"}])
 {
@@ -12,19 +12,23 @@ directive @hello on FIELD_DEFINITION
 
 directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
-directive @join__field(graph: join__Graph!, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
+directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE
+
+directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 
 directive @join__graph(name: String!, url: String!) on ENUM_VALUE
 
 directive @join__implements(graph: join__Graph!, interface: String!) repeatable on OBJECT | INTERFACE
 
-directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true, isInterfaceObject: Boolean! = false) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+
+directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
 
 directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA
 
 directive @myDirective(a: String!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION | SCHEMA
 
 type DeliveryEstimates
   @join__type(graph: INVENTORY)
@@ -151,9 +155,9 @@ enum ShippingClass
   @join__type(graph: INVENTORY)
   @join__type(graph: PRODUCTS)
 {
-  STANDARD
-  EXPRESS
-  OVERNIGHT
+  STANDARD @join__enumValue(graph: INVENTORY) @join__enumValue(graph: PRODUCTS)
+  EXPRESS @join__enumValue(graph: INVENTORY) @join__enumValue(graph: PRODUCTS)
+  OVERNIGHT @join__enumValue(graph: INVENTORY)
 }
 
 interface SkuItf
@@ -169,4 +173,4 @@ type User
   email: ID! @tag(name: "test-from-users")
   totalProductsCreated: Int
   name: String @join__field(graph: USERS)
-}
+}
diff --git a/supergraph/schema/local.graphql b/supergraph/schema/local.graphql
@@ -1,7 +1,7 @@
 schema
   @link(url: "https://specs.apollo.dev/link/v1.0")
-  @link(url: "https://specs.apollo.dev/join/v0.2", for: EXECUTION)
-  @link(url: "https://specs.apollo.dev/tag/v0.2")
+  @link(url: "https://specs.apollo.dev/join/v0.3", for: EXECUTION)
+  @link(url: "https://specs.apollo.dev/tag/v0.3")
   @link(url: "https://specs.apollo.dev/inaccessible/v0.2", for: SECURITY)
   @link(url: "https://myspecs.dev/myDirective/v1.0", import: ["@myDirective", {name: "@anotherDirective", as: "@hello"}])
 {
@@ -12,19 +12,23 @@ directive @hello on FIELD_DEFINITION
 
 directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
-directive @join__field(graph: join__Graph!, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
+directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE
+
+directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 
 directive @join__graph(name: String!, url: String!) on ENUM_VALUE
 
 directive @join__implements(graph: join__Graph!, interface: String!) repeatable on OBJECT | INTERFACE
 
-directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true, isInterfaceObject: Boolean! = false) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+
+directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
 
 directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA
 
 directive @myDirective(a: String!) on FIELD_DEFINITION
 
-directive @tag(name: String!) repeatable on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @tag(name: String!) repeatable on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION | SCHEMA
 
 type DeliveryEstimates
   @join__type(graph: INVENTORY)
@@ -151,9 +155,9 @@ enum ShippingClass
   @join__type(graph: INVENTORY)
   @join__type(graph: PRODUCTS)
 {
-  STANDARD
-  EXPRESS
-  OVERNIGHT
+  STANDARD @join__enumValue(graph: INVENTORY) @join__enumValue(graph: PRODUCTS)
+  EXPRESS @join__enumValue(graph: INVENTORY) @join__enumValue(graph: PRODUCTS)
+  OVERNIGHT @join__enumValue(graph: INVENTORY)
 }
 
 interface SkuItf
@@ -169,4 +173,4 @@ type User
   email: ID! @tag(name: "test-from-users")
   totalProductsCreated: Int
   name: String @join__field(graph: USERS)
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:18-bullseye-slim`
	`1`	`+FROM node:18-bookworm-slim`
`2`	`2`
`3`	`3`	`WORKDIR /usr/src/app`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=linux/amd64 debian:bullseye-slim`
	`1`	`+FROM --platform=linux/amd64 debian:bookworm-slim`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install -y \`
`4`	`4`	`ca-certificates \`