Merge pull request #11472 from danthegoodman1/main

Configuration changes for Golang example to work on Apple Silicon out of the box

packaging/docker/samples/golang/.env

@@ -20,7 +20,7 @@
 COMPOSE_PROJECT_NAME=fdbgolangsample
 
 FDB_API_VERSION=730
-FDB_VERSION=7.3.27
+FDB_VERSION=7.3.26
 FDB_COORDINATOR=fdb-coordinator
 FDB_NETWORKING_MODE=container
 FDB_COORDINATOR_PORT=4500

packaging/docker/samples/golang/README.md

@@ -14,7 +14,7 @@ This will start:
 
 * 1 coordinator,
 * 2 fdbservers,
-* a golang application. 
+* a golang application.
 
 You can now head to [http://localhost:8080/counter](http://localhost:8080/counter) and see the counter rising-up after each refresh.
 
@@ -31,4 +31,4 @@ FDB_CLUSTER_FILE=./docker.cluster fdbcli
 
 ```
 docker-compose down
-```
+```

packaging/docker/samples/golang/docker-compose.yml

@@ -28,6 +28,7 @@ services:
       FDB_COORDINATOR: ${FDB_COORDINATOR}
       FDB_NETWORKING_MODE: ${FDB_NETWORKING_MODE}
       FDB_COORDINATOR_PORT: ${FDB_COORDINATOR_PORT}
+    platform: "linux/amd64"
 
   fdb-server-1:
     depends_on:
@@ -37,6 +38,7 @@ services:
       FDB_COORDINATOR: ${FDB_COORDINATOR}
       FDB_NETWORKING_MODE: ${FDB_NETWORKING_MODE}
       FDB_COORDINATOR_PORT: ${FDB_COORDINATOR_PORT}
+    platform: "linux/amd64"
 
   fdb-server-2:
     depends_on:
@@ -46,6 +48,7 @@ services:
       FDB_COORDINATOR: ${FDB_COORDINATOR}
       FDB_NETWORKING_MODE: ${FDB_NETWORKING_MODE}
       FDB_COORDINATOR_PORT: ${FDB_COORDINATOR_PORT}
+    platform: "linux/amd64"
 
   # Bring up the application so that it depends on the cluster.
   app:
@@ -62,3 +65,4 @@ services:
     environment:
       FDB_COORDINATOR: ${FDB_COORDINATOR}
       FDB_API_VERSION: ${FDB_API_VERSION}
+    platform: "linux/amd64"