Skip to content

Commit 53bad0f

Browse files
mlwellesmlwelles
committed
fix(test): use LINUX_GOBIN in all Docker Compose files for macOS compat
30 Docker Compose files hardcoded $GOPATH/bin as the binary mount source. On macOS, this mounts the native macOS binary into Linux containers, causing them to fail on startup. Replace all 78 occurrences with ${LINUX_GOBIN:-$GOPATH/bin} to match the pattern already used in dgraph/docker-compose.yml. On Linux, LINUX_GOBIN defaults to $GOPATH/bin (no change). On macOS, it points to the cross-compiled Linux binary directory.
1 parent e3e8a39 commit 53bad0f

30 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎dgraph/cmd/alpha/mutations_mode/docker-compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
- "9080"
1414
volumes:
1515
- type: bind
16-
source: $GOPATH/bin
16+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1717
target: /gobin
1818
read_only: true
1919
command:
@@ -30,7 +30,7 @@ services:
3030
- "9080"
3131
volumes:
3232
- type: bind
33-
source: $GOPATH/bin
33+
source: ${LINUX_GOBIN:-$GOPATH/bin}
3434
target: /gobin
3535
read_only: true
3636
command:
@@ -47,7 +47,7 @@ services:
4747
- "9080"
4848
volumes:
4949
- type: bind
50-
source: $GOPATH/bin
50+
source: ${LINUX_GOBIN:-$GOPATH/bin}
5151
target: /gobin
5252
read_only: true
5353
command:
@@ -64,7 +64,7 @@ services:
6464
- "6080"
6565
volumes:
6666
- type: bind
67-
source: $GOPATH/bin
67+
source: ${LINUX_GOBIN:-$GOPATH/bin}
6868
target: /gobin
6969
read_only: true
7070
command:
@@ -82,7 +82,7 @@ services:
8282
- "6080"
8383
volumes:
8484
- type: bind
85-
source: $GOPATH/bin
85+
source: ${LINUX_GOBIN:-$GOPATH/bin}
8686
target: /gobin
8787
read_only: true
8888
command:
@@ -100,7 +100,7 @@ services:
100100
- "6080"
101101
volumes:
102102
- type: bind
103-
source: $GOPATH/bin
103+
source: ${LINUX_GOBIN:-$GOPATH/bin}
104104
target: /gobin
105105
read_only: true
106106
command:

‎graphql/e2e/admin_auth/poorman_auth/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
ports:

‎graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
- type: bind

‎graphql/e2e/auth/debug_off/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
ports:

‎graphql/e2e/auth/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
ports:

‎graphql/e2e/auth_closed_by_default/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
ports:

‎graphql/e2e/custom_logic/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- 9080
1313
volumes:
1414
- type: bind
15-
source: $GOPATH/bin
15+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1616
target: /gobin
1717
read_only: true
1818
command:
@@ -28,7 +28,7 @@ services:
2828
- 6080
2929
volumes:
3030
- type: bind
31-
source: $GOPATH/bin
31+
source: ${LINUX_GOBIN:-$GOPATH/bin}
3232
target: /gobin
3333
read_only: true
3434
command:

‎graphql/e2e/directives/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
ports:

‎graphql/e2e/multi_tenancy/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- 9080
1313
volumes:
1414
- type: bind
15-
source: $GOPATH/bin
15+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1616
target: /gobin
1717
read_only: true
1818
- type: bind
@@ -35,7 +35,7 @@ services:
3535
- 9080
3636
volumes:
3737
- type: bind
38-
source: $GOPATH/bin
38+
source: ${LINUX_GOBIN:-$GOPATH/bin}
3939
target: /gobin
4040
read_only: true
4141
- type: bind
@@ -58,7 +58,7 @@ services:
5858
- 9080
5959
volumes:
6060
- type: bind
61-
source: $GOPATH/bin
61+
source: ${LINUX_GOBIN:-$GOPATH/bin}
6262
target: /gobin
6363
read_only: true
6464
- type: bind
@@ -79,7 +79,7 @@ services:
7979
- 6080
8080
volumes:
8181
- type: bind
82-
source: $GOPATH/bin
82+
source: ${LINUX_GOBIN:-$GOPATH/bin}
8383
target: /gobin
8484
read_only: true
8585
command:

‎graphql/e2e/normal/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero1
1212
volumes:
1313
- type: bind
14-
source: $GOPATH/bin
14+
source: ${LINUX_GOBIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -23,7 +23,7 @@ services:
2323
working_dir: /data/alpha1
2424
volumes:
2525
- type: bind
26-
source: $GOPATH/bin
26+
source: ${LINUX_GOBIN:-$GOPATH/bin}
2727
target: /gobin
2828
read_only: true
2929
ports:

0 commit comments

Comments
 (0)