Merge pull request #296 from maxekman/fix/gcp-emulator-images

Fix / GCP emulator and MongoDB images
looplab · Feb 4, 2021 · 698de42 · 698de42
2 parents f3c0cdd + 5619189
commit 698de42
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -42,12 +42,12 @@ upload_cover:
 
 .PHONY: run
 run:
-	docker-compose up -d mongo gpubsub kafka
+	docker-compose up -d mongodb gpubsub kafka
 	sleep 15
 
 .PHONY: run_mongodb
 run_mongodb:
-	docker-compose up -d mongo
+	docker-compose up -d mongodb
 
 .PHONY: run_gpubsub
 run_gpubsub:
@@ -66,6 +66,6 @@ clean:
 	@find . -name \.coverprofile -type f -delete
 	@rm -f gover.coverprofile
 
-.PHONY: mongo_shell
-mongo_shell:
-	docker run -it --network eventhorizon_default --rm mongo:4.2 mongo --host mongo test
+.PHONY: mongodb_shell
+mongodb_shell:
+	docker run -it --network eventhorizon_default --rm mongo:4.4 mongo --host mongodb test
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,19 +4,19 @@ services:
   golang:
     image: golang:1.15
     environment:
-      MONGO_HOST: "mongo:27017"
+      MONGODB_HOST: "mongodb:27017"
       PUBSUB_EMULATOR_HOST: "gpubsub:8793"
     volumes:
       - .:/eventhorizon
     working_dir: /eventhorizon
 
-  mongo:
-    image: mongo:4.2
+  mongodb:
+    image: mongo:4.4
     ports:
       - "27017:27017"
 
   gpubsub:
-    image: google/cloud-sdk:318.0.0
+    image: gcr.io/google.com/cloudsdktool/cloud-sdk:326.0.0-emulators
     ports:
       - "8793:8793"
     entrypoint:

diff --git a/eventstore/mongodb/eventstore_test.go b/eventstore/mongodb/eventstore_test.go
@@ -29,7 +29,7 @@ func TestEventStoreIntegration(t *testing.T) {
 	}
 
 	// Use MongoDB in Docker with fallback to localhost.
-	url := os.Getenv("MONGO_HOST")
+	url := os.Getenv("MONGODB_HOST")
 	if url == "" {
 		url = "localhost:27017"
 	}

diff --git a/examples/guestlist/mongodb/mongodb_test.go b/examples/guestlist/mongodb/mongodb_test.go
@@ -39,7 +39,7 @@ func ExampleIntegration() {
 	}
 
 	// Use MongoDB in Docker with fallback to localhost.
-	url := os.Getenv("MONGO_HOST")
+	url := os.Getenv("MONGODB_HOST")
 	if url == "" {
 		url = "localhost:27017"
 	}

diff --git a/examples/todomvc/backend/handler/handler_test.go b/examples/todomvc/backend/handler/handler_test.go
@@ -749,7 +749,7 @@ func NewIntegrationTestSession(ctx context.Context) (
 	eh.ReadWriteRepo,
 ) {
 	// Use MongoDB in Docker with fallback to localhost.
-	dbURL := os.Getenv("MONGO_HOST")
+	dbURL := os.Getenv("MONGODB_HOST")
 	if dbURL == "" {
 		dbURL = "localhost:27017"
 	}

diff --git a/examples/todomvc/backend/main.go b/examples/todomvc/backend/main.go
@@ -44,7 +44,7 @@ func main() {
 	log.Println("starting TodoMVC backend")
 
 	// Use MongoDB in Docker with fallback to localhost.
-	dbURL := os.Getenv("MONGO_HOST")
+	dbURL := os.Getenv("MONGODB_HOST")
 	if dbURL == "" {
 		dbURL = "localhost:27017"
 	}

diff --git a/examples/todomvc/docker-compose.yml b/examples/todomvc/docker-compose.yml
@@ -12,12 +12,12 @@ services:
     ports:
       - "8080:8080"
     environment:
-      MONGO_HOST: "mongo:27017"
+      MONGODB_HOST: "mongodb:27017"
       PUBSUB_EMULATOR_HOST: "gpubsub:8793"
       TRACING_URL: "tracing"
 
-  mongo:
-    image: mongo:4.2
+  mongodb:
+    image: mongo:4.4
     ports:
       - "27017:27017"
 

diff --git a/repo/mongodb/repo_test.go b/repo/mongodb/repo_test.go
@@ -37,7 +37,7 @@ func TestReadRepoIntegration(t *testing.T) {
 	}
 
 	// Local Mongo testing with Docker
-	url := os.Getenv("MONGO_HOST")
+	url := os.Getenv("MONGODB_HOST")
 
 	if url == "" {
 		// Default to localhost
@@ -180,7 +180,7 @@ func TestRepository(t *testing.T) {
 	}
 
 	// Local Mongo testing with Docker
-	url := os.Getenv("MONGO_HOST")
+	url := os.Getenv("MONGODB_HOST")
 	if url == "" {
 		// Default to localhost
 		url = "localhost:27017"