commit 972dbcf3484d1b7436076f4811c97535b8123bb8
author Alex Hays <alex.hays@leftfieldlabs.com> Thu May 18 16:40:09 2023 -0400
committer Jamal Carvalho <jamal@golang.org> Fri May 19 19:44:48 2023 +0000
tree e85e51a26aafd845ec8e2c86df0d31d2d68981b7
parent 4481c155f5e5b399472f8d311150e29aef9bf771

Fix content.yaml syntax

Current content.yaml format errors with docker-compose v2.17+. Running snapshot tests currently errors with:

unmarshal errors:
  line 37: mapping key “<<” already defined at line 36
  line 52: mapping key “<<” already defined at line 51
  line 83: mapping key “<<” already defined at line 82

This CR fixes that error.

Context:
https://github.com/docker/compose/issues/10407#issuecomment-1484787932

Change-Id: I15d9e1d7bb799819a783904cf9dc0bb5a26efcae
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/496189
Run-TryBot: Jamal Carvalho <jamal@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>

devtools/docker/compose.yaml

diff --git a/devtools/docker/compose.yaml b/devtools/docker/compose.yaml
index b54d88d..38ce4e9 100644
--- a/devtools/docker/compose.yaml
+++ b/devtools/docker/compose.yaml
@@ -33,8 +33,7 @@
      # This should match the version we are using on Cloud Run.
     image: golang:1.20
     environment:
-      <<: *database-variables
-      <<: *go-variables
+      <<: [*database-variables, *go-variables]
       GO_DISCOVERY_TESTDB: ${GO_DISCOVERY_TESTDB:-"true"}
       # TERM is set to xterm-256color for use by devtools/lib.sh.
       TERM: xterm-256color
@@ -48,8 +47,7 @@
     depends_on:
       - frontend
     environment:
-      <<: *database-variables
-      <<: *go-variables
+      <<: [*database-variables, *go-variables]
       WAITFORIT_TIMEOUT: 300
     entrypoint: ./third_party/wait-for-it/wait-for-it.sh frontend:8080 -- go run
     command: "tests/search/main.go -frontend http://frontend:8080"
@@ -79,8 +77,7 @@
           go run ./devtools/cmd/db/main.go migrate &&
           go run ./cmd/frontend -host=0.0.0.0:8080"
     environment:
-      <<: *database-variables
-      <<: *go-variables
+      <<: [*database-variables, *go-variables]
       PORT: 8080
       WAITFORIT_TIMEOUT: 300
     volumes:
@@ -102,8 +99,7 @@
           go run ./devtools/cmd/db/main.go migrate &&
           go run ./devtools/cmd/seeddb/main.go -seed ${GO_DISCOVERY_SEED_DB_FILE:-seed.txt}"
     environment:
-      <<: *database-variables
-      <<: *go-variables
+      <<: [*database-variables, *go-variables]
       WAITFORIT_TIMEOUT: 300
     volumes:
       - ../../:/pkgsite
@@ -147,8 +143,7 @@
     image: golang:1.20
     entrypoint: go
     environment:
-      <<: *database-variables
-      <<: *go-variables
+      <<: [*database-variables, *go-variables]
     volumes:
       - ../../:/pkgsite
       - gomodcache:/gomodcache