Update gateways, use debian instead of alpine and refactor docker artifacts (#656)

enisdenjo · web-flow · commit 858426ed5df4 · 2025-04-16T18:58:22.000+02:00
diff --git a/docker-compose.metrics.yaml b/docker-compose.metrics.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 networks:
   test:
     name: test
diff --git a/federation/gateways/apollo-router/docker-compose.yaml b/federation/gateways/apollo-router/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   gateway:
     image: ghcr.io/apollographql/router:v2.1.0
diff --git a/federation/gateways/apollo-server/Dockerfile b/federation/gateways/apollo-server/Dockerfile
@@ -1,20 +1,15 @@
-FROM node:22-alpine
+FROM node:23-slim
 
-RUN apk --no-cache add curl
-
-RUN addgroup -S gw && adduser -S gw -G gw
+RUN apt-get update -y && apt-get install curl -y
 
 WORKDIR /home/gw
 COPY supergraph.graphql index.ts ./
 COPY package.json yarn.lock ./
 
 RUN yarn install --production
-ENV PORT 4000
-ENV NODE_ENV production
+ENV PORT=4000
+ENV NODE_ENV=production
 
 EXPOSE 4000
 
-USER gw
-WORKDIR /home/gw
-
-CMD yarn start
+CMD ["yarn", "start"]
diff --git a/federation/gateways/apollo-server/docker-compose.yaml b/federation/gateways/apollo-server/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   gateway:
     image: gateway/apollo-server
diff --git a/federation/gateways/cosmo/Dockerfile b/federation/gateways/cosmo/Dockerfile
@@ -1,11 +1,11 @@
-FROM alpine:20250108
+FROM debian:12-slim
 
-RUN apk --no-cache add curl
+RUN apt-get update -y && apt-get install curl -y
 
 WORKDIR /home/gw
 COPY router.json ./
 
-ENV ROUTER_VERSION=0.183.2
+ENV ROUTER_VERSION=0.199.1
 
 RUN curl -L https://github.com/wundergraph/cosmo/releases/download/router%40${ROUTER_VERSION}/router-router@${ROUTER_VERSION}-linux-$(uname -m | sed s:aarch:arm:| sed s:x86_:amd:).tar.gz | gunzip -dc | tar x && mv router /usr/local/bin
 
diff --git a/federation/gateways/cosmo/docker-compose.yaml b/federation/gateways/cosmo/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   gateway:
     image: gateway/cosmo
diff --git a/federation/gateways/grafbase/Dockerfile b/federation/gateways/grafbase/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/grafbase/gateway:0.33.0
+FROM ghcr.io/grafbase/gateway:0.35.0
 
 COPY supergraph.graphql ./
 
diff --git a/federation/gateways/grafbase/docker-compose.yaml b/federation/gateways/grafbase/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   gateway:
     image: gateway/grafbase
diff --git a/federation/gateways/hive-gateway-bun/docker-compose.yaml b/federation/gateways/hive-gateway-bun/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   gateway:
-    image: ghcr.io/graphql-hive/gateway:1.13.4-bun
+    image: ghcr.io/graphql-hive/gateway:1.13.6-bun
     container_name: gateway
     networks:
       - test
diff --git a/federation/gateways/hive-gateway/docker-compose.yaml b/federation/gateways/hive-gateway/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   gateway:
-    image: ghcr.io/graphql-hive/gateway:1.13.4
+    image: ghcr.io/graphql-hive/gateway:1.13.6
     container_name: gateway
     networks:
       - test
@@ -24,11 +24,18 @@ services:
         source: federation/gateways/hive-gateway/supergraph.graphql
         target: /serve/supergraph.graphql
     healthcheck:
-      test: [ "CMD", "/usr/lib/apt/apt-helper", "download-file", "http://127.0.0.1:4000/graphql?query=%7B+users+%7B+reviews+%7B+product+%7B+reviews+%7B+author+%7B+reviews+%7B+product+%7B+name+%7D+%7D+%7D+%7D+%7D+%7D+%7D+%7D", "/tmp/health" ]
+      test:
+        [
+          "CMD",
+          "/usr/lib/apt/apt-helper",
+          "download-file",
+          "http://127.0.0.1:4000/graphql?query=%7B+users+%7B+reviews+%7B+product+%7B+reviews+%7B+author+%7B+reviews+%7B+product+%7B+name+%7D+%7D+%7D+%7D+%7D+%7D+%7D+%7D",
+          "/tmp/health",
+        ]
       interval: 3s
       timeout: 5s
       retries: 10
-    command: [ "supergraph", "--jit" ]
+    command: ["supergraph", "--jit"]
     deploy:
       resources:
         limits:
diff --git a/federation/gateways/mercurius/Dockerfile b/federation/gateways/mercurius/Dockerfile
@@ -1,20 +1,17 @@
-FROM node:22-alpine
+FROM node:23-slim
 
-RUN apk --no-cache add curl
-
-RUN addgroup -S gw && adduser -S gw -G gw
+RUN apt-get update -y && apt-get install curl -y
 
 WORKDIR /home/gw
 COPY index.ts ./
 COPY package.json yarn.lock ./
 
 RUN yarn install --production
-ENV PORT 4000
-ENV NODE_ENV production
+ENV PORT=4000
+ENV NODE_ENV=production
 
 EXPOSE 4000
 
-USER gw
 WORKDIR /home/gw
 
-CMD yarn start
+CMD ["yarn", "start"]
diff --git a/federation/gateways/mercurius/docker-compose.yaml b/federation/gateways/mercurius/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   gateway:
     image: gateway/mercurius
diff --git a/federation/gateways/mercurius/package.json b/federation/gateways/mercurius/package.json
@@ -7,7 +7,7 @@
     "tsx": "4.19.3",
     "typescript": "5.8.3",
     "graphql": "16.10.0",
-    "fastify": "5.2.2",
+    "fastify": "5.3.0",
     "@mercuriusjs/gateway": "5.0.0"
   },
   "resolutions": {
diff --git a/federation/subgraphs/docker-compose.subgraphs.local.yaml b/federation/subgraphs/docker-compose.subgraphs.local.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   accounts:
     build:
diff --git a/federation/subgraphs/docker-compose.subgraphs.yaml b/federation/subgraphs/docker-compose.subgraphs.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   accounts:
     image: '${DOCKER_REGISTRY}subgraph-accounts${DOCKER_TAG}'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-version: '3.8'`
`2`		`-`
`3`	`1`	`networks:`
`4`	`2`	`test:`
`5`	`3`	`name: test`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-version: "3.8"`
`2`		`-`
`3`	`1`	`services:`
`4`	`2`	`gateway:`
`5`	`3`	`image: ghcr.io/apollographql/router:v2.1.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/grafbase/gateway:0.33.0`
	`1`	`+FROM ghcr.io/grafbase/gateway:0.35.0`
`2`	`2`
`3`	`3`	`COPY supergraph.graphql ./`
`4`	`4`