feat: gateway restores removes containers

shuttle-hq · Nov 21, 2022 · a98225c · a98225c
1 parent d8fedbd
commit a98225c
Show file tree

Hide file tree

Showing 6 changed files with 202 additions and 92 deletions.
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ DD_ENV=production
 USE_TLS=enable
 else
 DOCKER_COMPOSE_FILES=-f docker-compose.yml -f docker-compose.dev.yml
-STACK=shuttle-dev
+STACK?=shuttle-dev
 APPS_FQDN=unstable.shuttleapp.rs
 DB_FQDN=db.unstable.shuttle.rs
 CONTAINER_REGISTRY=public.ecr.aws/shuttle-dev

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 10.99.0.0/24
+        - subnet: 10.99.0.0/16
 services:
   gateway:
     image: "${CONTAINER_REGISTRY}/gateway:${BACKEND_TAG}"

diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
@@ -24,7 +24,6 @@ hyper = { version = "0.14.19", features = [ "stream" ] }
 # not great, but waiting for WebSocket changes to be merged
 hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "bug/host_header" }
 instant-acme = "0.1.0"
-
 lazy_static = "1.4.0"
 once_cell = "1.14.0"
 opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
@@ -58,3 +57,4 @@ colored = "2"
 portpicker = "0.1"
 snailquote = "0.3"
 tempfile = "3.3.0"
+