Skip to content

Commit c4f9643

Browse files
mlwellesmlwelles
committed
chore(test): update docker-compose files for GOPATH_LINUX_BIN
Update all systest docker-compose.yml files to mount the dgraph binary from GOPATH_LINUX_BIN instead of hardcoded GOPATH/bin path. This enables Docker-based tests to find the correct Linux binary on both Linux and macOS systems.
1 parent cae957b commit c4f9643

29 files changed

Lines changed: 104 additions & 104 deletions

File tree

‎dgraph/docker-compose.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
service: zero
1212
volumes:
1313
- type: bind
14-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
14+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1515
target: /gobin
1616
read_only: true
1717
command:
@@ -32,7 +32,7 @@ services:
3232
service: zero
3333
volumes:
3434
- type: bind
35-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
35+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
3636
target: /gobin
3737
read_only: true
3838
command:
@@ -52,7 +52,7 @@ services:
5252
service: zero
5353
volumes:
5454
- type: bind
55-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
55+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
5656
target: /gobin
5757
read_only: true
5858
command:
@@ -64,7 +64,7 @@ services:
6464
working_dir: /data/alpha1
6565
volumes:
6666
- type: bind
67-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
67+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
6868
target: /gobin
6969
read_only: true
7070
- type: bind
@@ -94,7 +94,7 @@ services:
9494
- alpha1
9595
volumes:
9696
- type: bind
97-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
97+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
9898
target: /gobin
9999
read_only: true
100100
- type: bind
@@ -124,7 +124,7 @@ services:
124124
- alpha2
125125
volumes:
126126
- type: bind
127-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
127+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
128128
target: /gobin
129129
read_only: true
130130
- type: bind
@@ -154,7 +154,7 @@ services:
154154
- alpha3
155155
volumes:
156156
- type: bind
157-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
157+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
158158
target: /gobin
159159
read_only: true
160160
- type: bind
@@ -184,7 +184,7 @@ services:
184184
- alpha4
185185
volumes:
186186
- type: bind
187-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
187+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
188188
target: /gobin
189189
read_only: true
190190
- type: bind
@@ -214,7 +214,7 @@ services:
214214
- alpha5
215215
volumes:
216216
- type: bind
217-
source: ${GOPATH:?GOPATH environment variable is required but not set}/bin
217+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
218218
target: /gobin
219219
read_only: true
220220
- type: bind

‎systest/1million/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- "6080"
1111
volumes:
1212
- type: bind
13-
source: $GOPATH/bin
13+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1414
target: /gobin
1515
read_only: true
1616
- type: volume

‎systest/21million/bulk/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- "6080"
1111
volumes:
1212
- type: bind
13-
source: $GOPATH/bin
13+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1414
target: /gobin
1515
read_only: true
1616
- type: volume

‎systest/21million/live/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: ${GOPATH_LINUX_BIN:-$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: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
3232
target: /gobin
3333
read_only: true
3434
command:

‎systest/acl/restore/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- 9080
1111
volumes:
1212
- type: bind
13-
source: $GOPATH/bin
13+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1414
target: /gobin
1515
read_only: true
1616
- type: bind
@@ -38,7 +38,7 @@ services:
3838
- 6080
3939
volumes:
4040
- type: bind
41-
source: $GOPATH/bin
41+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
4242
target: /gobin
4343
read_only: true
4444
command:

‎systest/audit/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
- "9080"
99
volumes:
1010
- type: bind
11-
source: $GOPATH/bin
11+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1212
target: /gobin
1313
read_only: true
1414
- type: bind
@@ -28,7 +28,7 @@ services:
2828
- "6080"
2929
volumes:
3030
- type: bind
31-
source: $GOPATH/bin
31+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
3232
target: /gobin
3333
read_only: true
3434
- type: bind

‎systest/audit_encrypted/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
- "9080"
99
volumes:
1010
- type: bind
11-
source: $GOPATH/bin
11+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1212
target: /gobin
1313
read_only: true
1414
- type: bind
@@ -32,7 +32,7 @@ services:
3232
- "6080"
3333
volumes:
3434
- type: bind
35-
source: $GOPATH/bin
35+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
3636
target: /gobin
3737
read_only: true
3838
- type: bind

‎systest/backup/advanced-scenarios/127-Namespace/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
- 9080
1515
volumes:
1616
- type: bind
17-
source: $GOPATH/bin
17+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1818
target: /gobin
1919
read_only: true
2020
- type: bind
@@ -37,7 +37,7 @@ services:
3737
- 6080
3838
volumes:
3939
- type: bind
40-
source: $GOPATH/bin
40+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
4141
target: /gobin
4242
read_only: true
4343
- data-volume:/data/backups/
@@ -57,7 +57,7 @@ services:
5757
- 9080
5858
volumes:
5959
- type: bind
60-
source: $GOPATH/bin
60+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
6161
target: /gobin
6262
read_only: true
6363
- type: bind
@@ -79,7 +79,7 @@ services:
7979
- 6080
8080
volumes:
8181
- type: bind
82-
source: $GOPATH/bin
82+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
8383
target: /gobin
8484
read_only: true
8585
- data-volume:/data/backups/

‎systest/backup/advanced-scenarios/acl-nonAcl/docker-compose.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- 9080
1717
volumes:
1818
- type: bind
19-
source: $GOPATH/bin
19+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
2020
target: /gobin
2121
read_only: true
2222
- type: bind
@@ -38,7 +38,7 @@ services:
3838
- 6080
3939
volumes:
4040
- type: bind
41-
source: $GOPATH/bin
41+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
4242
target: /gobin
4343
read_only: true
4444
- data-volume:/data/backups/
@@ -59,7 +59,7 @@ services:
5959
- 9080
6060
volumes:
6161
- type: bind
62-
source: $GOPATH/bin
62+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
6363
target: /gobin
6464
read_only: true
6565
- data-volume:/data/backups/
@@ -77,7 +77,7 @@ services:
7777
- 6080
7878
volumes:
7979
- type: bind
80-
source: $GOPATH/bin
80+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
8181
target: /gobin
8282
read_only: true
8383
- data-volume:/data/backups/
@@ -99,7 +99,7 @@ services:
9999
- 9080
100100
volumes:
101101
- type: bind
102-
source: $GOPATH/bin
102+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
103103
target: /gobin
104104
read_only: true
105105
- type: bind
@@ -121,7 +121,7 @@ services:
121121
- 6080
122122
volumes:
123123
- type: bind
124-
source: $GOPATH/bin
124+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
125125
target: /gobin
126126
read_only: true
127127
- data-volume:/data/backups/
@@ -142,7 +142,7 @@ services:
142142
- 9080
143143
volumes:
144144
- type: bind
145-
source: $GOPATH/bin
145+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
146146
target: /gobin
147147
read_only: true
148148
- data-volume:/data/backups/
@@ -160,7 +160,7 @@ services:
160160
- 6080
161161
volumes:
162162
- type: bind
163-
source: $GOPATH/bin
163+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
164164
target: /gobin
165165
read_only: true
166166
- data-volume:/data/backups/

‎systest/backup/advanced-scenarios/deleted-namespace/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
- 9080
1515
volumes:
1616
- type: bind
17-
source: $GOPATH/bin
17+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
1818
target: /gobin
1919
read_only: true
2020
- type: bind
@@ -36,7 +36,7 @@ services:
3636
- 6080
3737
volumes:
3838
- type: bind
39-
source: $GOPATH/bin
39+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
4040
target: /gobin
4141
read_only: true
4242
- data-volume:/data/backups/
@@ -56,7 +56,7 @@ services:
5656
- 9080
5757
volumes:
5858
- type: bind
59-
source: $GOPATH/bin
59+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
6060
target: /gobin
6161
read_only: true
6262
- type: bind
@@ -78,7 +78,7 @@ services:
7878
- 6080
7979
volumes:
8080
- type: bind
81-
source: $GOPATH/bin
81+
source: ${GOPATH_LINUX_BIN:-$GOPATH/bin}
8282
target: /gobin
8383
read_only: true
8484
- data-volume:/data/backups/

0 commit comments

Comments
 (0)