Skip to content

Commit 567acb6

Browse files
joshua-goldsteinjoshua-goldstein
committed
add custom dirs
1 parent 380f3be commit 567acb6

File tree

3 files changed

+195
-1
lines changed

3 files changed

+195
-1
lines changed

‎systest/backup/minio-large/docker-compose-arm64.yml

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# Auto-generated with: [./compose -a 3 -z 1 -r 1 --minio --minio_port=9001 --minio_env_file=../../backup.env -w --port_offset=0 --expose_ports=false --mem= --names=false -O ../systest/backup/minio-large/docker-compose.yml]
2+
#
3+
version: "3.5"
4+
services:
5+
alpha1:
6+
image: dgraph/dgraph:local
7+
working_dir: /data/alpha1
8+
env_file:
9+
- ../../backup.env
10+
labels:
11+
cluster: test
12+
ports:
13+
- "8080"
14+
- "9080"
15+
volumes:
16+
- type: bind
17+
source: $GOPATH/bin
18+
target: /gobin
19+
read_only: true
20+
- type: bind
21+
source: ../../../tlstest/mtls_internal/tls/alpha1
22+
target: /dgraph-tls
23+
read_only: true
24+
command: /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2
25+
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
26+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;"
27+
alpha2:
28+
image: dgraph/dgraph:local
29+
working_dir: /data/alpha2
30+
env_file:
31+
- ../../backup.env
32+
labels:
33+
cluster: test
34+
ports:
35+
- "8080"
36+
- "9080"
37+
volumes:
38+
- type: bind
39+
source: $GOPATH/bin
40+
target: /gobin
41+
read_only: true
42+
- type: bind
43+
source: ../../../tlstest/mtls_internal/tls/alpha2
44+
target: /dgraph-tls
45+
read_only: true
46+
command: /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2
47+
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
48+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;"
49+
alpha3:
50+
image: dgraph/dgraph:local
51+
working_dir: /data/alpha3
52+
env_file:
53+
- ../../backup.env
54+
labels:
55+
cluster: test
56+
ports:
57+
- "8080"
58+
- "9080"
59+
volumes:
60+
- type: bind
61+
source: $GOPATH/bin
62+
target: /gobin
63+
read_only: true
64+
- type: bind
65+
source: ../../../tlstest/mtls_internal/tls/alpha3
66+
target: /dgraph-tls
67+
read_only: true
68+
command: /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2
69+
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
70+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;"
71+
minio:
72+
image: minio/minio:RELEASE.2020-11-13T20-10-18Z-arm64
73+
env_file:
74+
- ../../backup.env
75+
ports:
76+
- "9001"
77+
command: minio server /data/minio --address :9001
78+
zero1:
79+
image: dgraph/dgraph:local
80+
working_dir: /data/zero1
81+
labels:
82+
cluster: test
83+
ports:
84+
- "5080"
85+
- "6080"
86+
volumes:
87+
- type: bind
88+
source: $GOPATH/bin
89+
target: /gobin
90+
read_only: true
91+
- type: bind
92+
source: ../../../tlstest/mtls_internal/tls/zero1
93+
target: /dgraph-tls
94+
read_only: true
95+
command: /gobin/dgraph ${COVERAGE_OUTPUT} zero --raft "idx=1;" --my=zero1:5080 --replicas=1 --logtostderr -v=2 --bindall
96+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.zero1.crt; client-key=/dgraph-tls/client.zero1.key;"
97+
volumes: {}

‎systest/backup/minio/docker-compose-arm64.yml

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# Auto-generated with: [./compose -a 3 -z 1 -r 1 --minio --minio_port=9001 --minio_env_file=../../backup.env -w --port_offset=0 --expose_ports=false --mem= --names=false -O ../systest/backup/minio/docker-compose.yml]
2+
#
3+
version: "3.5"
4+
services:
5+
alpha1:
6+
image: dgraph/dgraph:local
7+
working_dir: /data/alpha1
8+
env_file:
9+
- ../../backup.env
10+
labels:
11+
cluster: test
12+
ports:
13+
- "8080"
14+
- "9080"
15+
volumes:
16+
- type: bind
17+
source: $GOPATH/bin
18+
target: /gobin
19+
read_only: true
20+
- type: bind
21+
source: ../../../tlstest/mtls_internal/tls/alpha1
22+
target: /dgraph-tls
23+
read_only: true
24+
command: /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2
25+
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
26+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;"
27+
alpha2:
28+
image: dgraph/dgraph:local
29+
working_dir: /data/alpha2
30+
env_file:
31+
- ../../backup.env
32+
labels:
33+
cluster: test
34+
ports:
35+
- "8080"
36+
- "9080"
37+
volumes:
38+
- type: bind
39+
source: $GOPATH/bin
40+
target: /gobin
41+
read_only: true
42+
- type: bind
43+
source: ../../../tlstest/mtls_internal/tls/alpha2
44+
target: /dgraph-tls
45+
read_only: true
46+
command: /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2
47+
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
48+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;"
49+
alpha3:
50+
image: dgraph/dgraph:local
51+
working_dir: /data/alpha3
52+
env_file:
53+
- ../../backup.env
54+
labels:
55+
cluster: test
56+
ports:
57+
- "8080"
58+
- "9080"
59+
volumes:
60+
- type: bind
61+
source: $GOPATH/bin
62+
target: /gobin
63+
read_only: true
64+
- type: bind
65+
source: ../../../tlstest/mtls_internal/tls/alpha3
66+
target: /dgraph-tls
67+
read_only: true
68+
command: /gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2
69+
--security "whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16;"
70+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;"
71+
zero1:
72+
image: dgraph/dgraph:local
73+
working_dir: /data/zero1
74+
labels:
75+
cluster: test
76+
ports:
77+
- "5080"
78+
- "6080"
79+
volumes:
80+
- type: bind
81+
source: $GOPATH/bin
82+
target: /gobin
83+
read_only: true
84+
- type: bind
85+
source: ../../../tlstest/mtls_internal/tls/zero1
86+
target: /dgraph-tls
87+
read_only: true
88+
command: /gobin/dgraph ${COVERAGE_OUTPUT} zero --raft "idx=1;" --my=zero1:5080 --replicas=1 --logtostderr -v=2 --bindall
89+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt; server-key=/dgraph-tls/node.key; internal-port=true; client-cert=/dgraph-tls/client.zero1.crt; client-key=/dgraph-tls/client.zero1.key;"
90+
minio:
91+
image: minio/minio:RELEASE.2020-11-13T20-10-18Z-arm64
92+
env_file:
93+
- ../../backup.env
94+
ports:
95+
- "9001"
96+
command: minio server /data/minio --address :9001
97+
volumes: {}

‎t/t.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ func composeFileFor(pkg string) string {
524524
dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/", "", 1)
525525
if *arch == "arm64" {
526526
//todo: remove this custom logic
527-
if dir == "systest/export" {
527+
if dir == "systest/export" || dir == "systest/backup/minio" || dir == "systest/backup/minio-large" {
528528
return filepath.Join(*baseDir, dir, "docker-compose-arm64.yml")
529529
}
530530
filepath.Join(*baseDir, dir, "docker-compose.yml")

0 commit comments

Comments
 (0)