From ed68af80b00400db8e02e44d7fa481e11a776091 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Sun, 15 Dec 2024 01:07:26 -0800 Subject: [PATCH] docker: rename stuff for no reason --- Makefile | 8 ++++---- compose.yaml | 14 +++++++------- web/next.config.ts | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8225c30..ece4ecb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -maps-service: - DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service +submissions: + DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service-submissions web: docker build web -f web/Containerfile -t maps-service-web @@ -7,6 +7,6 @@ web: validation: docker build validation -f validation/Containerfile -t maps-service-validation -all: maps-service web validation +all: submissions web validation -.PHONY: maps-service web validation +.PHONY: submissions web validation diff --git a/compose.yaml b/compose.yaml index 1e8fdbd..554ec9f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -11,10 +11,10 @@ services: networks: - maps-service-network - mapsservice: + submissions: image: - maps-service - container_name: mapsservice + maps-service-submissions + container_name: submissions command: [ # debug "--debug","serve", @@ -55,15 +55,15 @@ services: env_file: - ../auth-compose/strafesnet.env environment: - - API_HOST=http://mapsservice:8082 - - API_HOST_INTERNAL=http://mapsservice:8083 + - API_HOST=http://submissions:8082 + - API_HOST_INTERNAL=http://submissions:8083 - NATS_HOST=nats:4222 - DATA_HOST=http://dataservice:9000 depends_on: - nats - # note: this races the mapsservice which creates a nats stream + # note: this races the submissions which creates a nats stream # the validation will panic if the nats stream is not created - - mapsservice + - submissions - dataservice networks: - maps-service-network diff --git a/web/next.config.ts b/web/next.config.ts index 25347a2..02f5827 100644 --- a/web/next.config.ts +++ b/web/next.config.ts @@ -7,7 +7,7 @@ const nextConfig: NextConfig = { return [ { source: "/v1/submissions/:submissionid/status/:statustype", - destination: "http://mapsservice:8082/v1/submissions/:submissionid/status/:statustype" + destination: "http://submissions:8082/v1/submissions/:submissionid/status/:statustype" } ] }