Skip to content

Commit 8cb3e49

Browse files
Gabriel Monroymboersma
Gabriel Monroy
authored and
mboersma
committed
ref(*): parameterize docker image org
1 parent 089636c commit 8cb3e49

11 files changed

Lines changed: 54 additions & 31 deletions

File tree

‎builder/tests/builder_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ func TestBuilder(t *testing.T) {
4545
defer os.Remove(tmpfile.Name())
4646

4747
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
48+
imageName := utils.ImagePrefix() + "builder" + ":" + tag
4849
etcdName := "deis-etcd-" + tag
4950
cli, stdout, stdoutPipe := dockercli.NewClient()
5051
dockercli.RunTestEtcd(t, etcdName, etcdPort)
5152
defer cli.CmdRm("-f", etcdName)
5253
handler := etcdutils.InitEtcd(setdir, setkeys, etcdPort)
5354
etcdutils.PublishEtcd(t, handler)
5455
host, port := utils.HostAddress(), utils.RandomPort()
55-
fmt.Printf("--- Run deis/builder:%s at %s:%s\n", tag, host, port)
56+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
5657
name := "deis-builder-" + tag
5758
defer cli.CmdRm("-f", "-v", name)
5859
go func() {
@@ -67,7 +68,7 @@ func TestBuilder(t *testing.T) {
6768
"-e", "EXTERNAL_PORT="+port,
6869
"--privileged",
6970
"-v", tmpfile.Name()+":/etc/environment_proxy",
70-
"deis/builder:"+tag)
71+
imageName)
7172
}()
7273
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-builder running")
7374
if err != nil {

‎cache/tests/cache_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ import (
1313
func TestCache(t *testing.T) {
1414
var err error
1515
tag := utils.BuildTag()
16+
imageName := utils.ImagePrefix() + "cache" + ":" + tag
1617
etcdPort := utils.RandomPort()
1718
etcdName := "deis-etcd-" + tag
1819
cli, stdout, stdoutPipe := dockercli.NewClient()
1920
dockercli.RunTestEtcd(t, etcdName, etcdPort)
2021
defer cli.CmdRm("-f", etcdName)
2122
host, port := utils.HostAddress(), utils.RandomPort()
22-
fmt.Printf("--- Run deis/cache:%s at %s:%s\n", tag, host, port)
23+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
2324
name := "deis-cache-" + tag
2425
defer cli.CmdRm("-f", name)
2526
go func() {
@@ -31,7 +32,7 @@ func TestCache(t *testing.T) {
3132
"-e", "EXTERNAL_PORT="+port,
3233
"-e", "HOST="+host,
3334
"-e", "ETCD_PORT="+etcdPort,
34-
"deis/cache:"+tag)
35+
imageName)
3536
}()
3637
dockercli.PrintToStdout(t, stdout, stdoutPipe, "started")
3738
if err != nil {

‎controller/tests/controller_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestController(t *testing.T) {
2626
"/deis/domains",
2727
}
2828
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
29+
imageName := utils.ImagePrefix() + "controller" + ":" + tag
2930

3031
//start etcd container
3132
etcdName := "deis-etcd-" + tag
@@ -38,7 +39,7 @@ func TestController(t *testing.T) {
3839
mock.RunMockDatabase(t, tag, etcdPort, utils.RandomPort())
3940
defer cli.CmdRm("-f", "deis-test-database-"+tag)
4041
host, port := utils.HostAddress(), utils.RandomPort()
41-
fmt.Printf("--- Run deis/controller:%s at %s:%s\n", tag, host, port)
42+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
4243
name := "deis-controller-" + tag
4344
defer cli.CmdRm("-f", name)
4445
go func() {
@@ -51,7 +52,7 @@ func TestController(t *testing.T) {
5152
"-e", "EXTERNAL_PORT="+port,
5253
"-e", "HOST="+host,
5354
"-e", "ETCD_PORT="+etcdPort,
54-
"deis/controller:"+tag)
55+
imageName)
5556
}()
5657
dockercli.PrintToStdout(t, stdout, stdoutPipe, "Booting")
5758
if err != nil {

‎database/tests/database_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
func TestDatabase(t *testing.T) {
1515
var err error
1616
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
17+
imageName := utils.ImagePrefix() + "database" + ":" + tag
1718
cli, stdout, stdoutPipe := dockercli.NewClient()
1819

1920
// start etcd container
@@ -28,7 +29,7 @@ func TestDatabase(t *testing.T) {
2829

2930
// run database container
3031
host, port := utils.HostAddress(), utils.RandomPort()
31-
fmt.Printf("--- Run deis/database:%s at %s:%s\n", tag, host, port)
32+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
3233
name := "deis-database-" + tag
3334
defer cli.CmdRm("-f", name)
3435
go func() {
@@ -40,7 +41,7 @@ func TestDatabase(t *testing.T) {
4041
"-e", "EXTERNAL_PORT="+port,
4142
"-e", "HOST="+host,
4243
"-e", "ETCD_PORT="+etcdPort,
43-
"deis/database:"+tag)
44+
imageName)
4445
}()
4546
dockercli.PrintToStdout(t, stdout, stdoutPipe, "database: postgres is running...")
4647
if err != nil {

‎logger/tests/logger_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
func TestLogger(t *testing.T) {
1414
var err error
1515
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
16+
imageName := utils.ImagePrefix() + "logger" + ":" + tag
1617

1718
//start etcd container
1819
etcdName := "deis-etcd-" + tag
@@ -21,7 +22,7 @@ func TestLogger(t *testing.T) {
2122
defer cli.CmdRm("-f", etcdName)
2223

2324
host, port := utils.HostAddress(), utils.RandomPort()
24-
fmt.Printf("--- Run deis/logger:%s at %s:%s\n", tag, host, port)
25+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
2526
name := "deis-logger-" + tag
2627
defer cli.CmdRm("-f", name)
2728
go func() {
@@ -33,7 +34,7 @@ func TestLogger(t *testing.T) {
3334
"-e", "EXTERNAL_PORT="+port,
3435
"-e", "HOST="+host,
3536
"-e", "ETCD_PORT="+etcdPort,
36-
"deis/logger:"+tag)
37+
imageName)
3738
}()
3839
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-logger running")
3940
if err != nil {

‎registry/tests/registry_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestRegistry(t *testing.T) {
2626
"/deis/store",
2727
}
2828
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
29+
imageName := utils.ImagePrefix() + "registry" + ":" + tag
2930
etcdName := "deis-etcd-" + tag
3031
cli, stdout, stdoutPipe := dockercli.NewClient()
3132
dockercli.RunTestEtcd(t, etcdName, etcdPort)
@@ -39,7 +40,7 @@ func TestRegistry(t *testing.T) {
3940
defer cli.CmdRm("-f", cephName)
4041

4142
host, port := utils.HostAddress(), utils.RandomPort()
42-
fmt.Printf("--- Run deis/registry:%s at %s:%s\n", tag, host, port)
43+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
4344
name := "deis-registry-" + tag
4445
defer cli.CmdRm("-f", name)
4546
go func() {
@@ -51,7 +52,7 @@ func TestRegistry(t *testing.T) {
5152
"-e", "EXTERNAL_PORT="+port,
5253
"-e", "HOST="+host,
5354
"-e", "ETCD_PORT="+etcdPort,
54-
"deis/registry:"+tag)
55+
imageName)
5556
}()
5657
dockercli.PrintToStdout(t, stdout, stdoutPipe, "Booting")
5758
if err != nil {

‎router/tests/router_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ func TestRouter(t *testing.T) {
3030
"/deis/store",
3131
}
3232
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
33+
imageName := utils.ImagePrefix() + "router" + ":" + tag
3334
etcdName := "deis-etcd-" + tag
3435
cli, stdout, stdoutPipe := dockercli.NewClient()
3536
dockercli.RunTestEtcd(t, etcdName, etcdPort)
3637
defer cli.CmdRm("-f", etcdName)
3738
handler := etcdutils.InitEtcd(setdir, setkeys, etcdPort)
3839
etcdutils.PublishEtcd(t, handler)
3940
host, port := utils.HostAddress(), utils.RandomPort()
40-
fmt.Printf("--- Run deis/router:%s at %s:%s\n", tag, host, port)
41+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
4142
name := "deis-router-" + tag
4243
go func() {
4344
_ = cli.CmdRm("-f", name)
@@ -50,7 +51,7 @@ func TestRouter(t *testing.T) {
5051
"-e", "HOST="+host,
5152
"-e", "ETCD_PORT="+etcdPort,
5253
"-e", "LOG=debug",
53-
"deis/router:"+tag)
54+
imageName)
5455
}()
5556
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-router running")
5657
if err != nil {

‎store/Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ MONITOR_DEV_IMAGE = $(DEV_REGISTRY)/$(MONITOR_IMAGE)
1616

1717
build: check-docker
1818
@# Build base as normal
19-
docker build -t deis/store-base:$(BUILD_TAG) base/
19+
docker build -t $(IMAGE_PREFIX)store-base:$(BUILD_TAG) base/
2020
$(foreach I, $(TEMPLATE_IMAGES), \
21-
sed -e "s/#FROM is generated dynamically by the Makefile/FROM deis\/store-base:${BUILD_TAG}/" $(I)/Dockerfile.template > $(I)/Dockerfile ; \
22-
docker build -t deis/store-$(I):$(BUILD_TAG) $(I)/ || exit 1; \
21+
sed -e "s,#FROM is generated dynamically by the Makefile,FROM $(IMAGE_PREFIX)store-base:${BUILD_TAG}," $(I)/Dockerfile.template > $(I)/Dockerfile ; \
22+
docker build -t $(IMAGE_PREFIX)store-$(I):$(BUILD_TAG) $(I)/ || exit 1; \
2323
rm $(I)/Dockerfile ; \
2424
)
2525

2626
clean: check-docker check-registry
2727
$(foreach I, $(BUILT_IMAGES), \
28-
docker rmi deis/store-$(I):$(BUILD_TAG) ; \
29-
docker rmi $(REGISTRY)/deis/store-$(I):$(BUILD_TAG) ; \
28+
docker rmi $(IMAGE_PREFIX)store-$(I):$(BUILD_TAG) ; \
29+
docker rmi $(REGISTRY)/$(IMAGE_PREFIX)store-$(I):$(BUILD_TAG) ; \
3030
)
3131

3232
full-clean: check-docker check-registry
3333
$(foreach I, $(BUILT_IMAGES), \
34-
docker images -q deis/store-$(I) | xargs docker rmi -f ; \
35-
docker images -q $(REGISTRY)/deis/store-$(I) | xargs docker rmi -f ; \
34+
docker images -q $(IMAGE_PREFIX)store-$(I) | xargs docker rmi -f ; \
35+
docker images -q $(REGISTRY)/$(IMAGE_PREFIX)store-$(I) | xargs docker rmi -f ; \
3636
)
3737

3838
install: check-deisctl

‎store/tests/store_test.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ func TestStore(t *testing.T) {
1616

1717
// Set up etcd, which will be used by all containers
1818
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
19+
1920
etcdName := "deis-etcd-" + tag
2021
cli, stdout, stdoutPipe := dockercli.NewClient()
2122
dockercli.RunTestEtcd(t, etcdName, etcdPort)
@@ -29,7 +30,8 @@ func TestStore(t *testing.T) {
2930
etcdutils.SetSingle(t, "/deis/store/pgNum", "64", etcdPort)
3031

3132
// test deis-store-monitor
32-
fmt.Printf("--- Run deis/store-monitor:%s at %s\n", tag, host)
33+
imageName := utils.ImagePrefix() + "store-monitor" + ":" + tag
34+
fmt.Printf("--- Run %s at %s\n", imageName, host)
3335
name := "deis-store-monitor-" + tag
3436
defer cli.CmdRm("-f", name)
3537
go func() {
@@ -41,7 +43,7 @@ func TestStore(t *testing.T) {
4143
"-e", "ETCD_PORT="+etcdPort,
4244
"-e", "NUM_STORES=1",
4345
"--net=host",
44-
"deis/store-monitor:"+tag)
46+
imageName)
4547
}()
4648
dockercli.PrintToStdout(t, stdout, stdoutPipe, "monmap e1: 1 mons at")
4749
if err != nil {
@@ -55,7 +57,8 @@ func TestStore(t *testing.T) {
5557
etcdutils.VerifyEtcdValue(t, "/deis/store/monSetupComplete", "youBetcha", etcdPort)
5658

5759
// test deis-store-daemon
58-
fmt.Printf("--- Run deis/store-daemon:%s at %s\n", tag, host)
60+
imageName = utils.ImagePrefix() + "store-daemon" + ":" + tag
61+
fmt.Printf("--- Run %s at %s\n", imageName, host)
5962
name = "deis-store-daemon-" + tag
6063
cli2, stdout2, stdoutPipe2 := dockercli.NewClient()
6164
defer cli2.CmdRm("-f", "-v", name)
@@ -67,7 +70,7 @@ func TestStore(t *testing.T) {
6770
"-e", "HOST="+host,
6871
"-e", "ETCD_PORT="+etcdPort,
6972
"--net=host",
70-
"deis/store-daemon:"+tag)
73+
imageName)
7174
}()
7275
dockercli.PrintToStdout(t, stdout2, stdoutPipe2, "journal close /var/lib/ceph/osd/ceph-0/journal")
7376
if err != nil {
@@ -79,7 +82,8 @@ func TestStore(t *testing.T) {
7982
etcdutils.VerifyEtcdValue(t, "/deis/store/osds/"+host, "0", etcdPort)
8083

8184
// test deis-store-metadata
82-
fmt.Printf("--- Run deis/store-metadata:%s at %s\n", tag, host)
85+
imageName = utils.ImagePrefix() + "store-metadata" + ":" + tag
86+
fmt.Printf("--- Run %s at %s\n", imageName, host)
8387
name = "deis-store-metadata-" + tag
8488
cli3, stdout3, stdoutPipe3 := dockercli.NewClient()
8589
defer cli3.CmdRm("-f", "-v", name)
@@ -91,16 +95,17 @@ func TestStore(t *testing.T) {
9195
"-e", "HOST="+host,
9296
"-e", "ETCD_PORT="+etcdPort,
9397
"--net=host",
94-
"deis/store-metadata:"+tag)
98+
imageName)
9599
}()
96100
dockercli.PrintToStdout(t, stdout3, stdoutPipe3, "mds.0.1 active_start")
97101
if err != nil {
98102
t.Fatal(err)
99103
}
100104

101105
// test deis-store-gateway
106+
imageName = utils.ImagePrefix() + "store-gateway" + ":" + tag
102107
port := utils.RandomPort()
103-
fmt.Printf("--- Run deis/store-gateway:%s at %s:%s\n", tag, host, port)
108+
fmt.Printf("--- Run %s at %s:%s\n", imageName, host, port)
104109
name = "deis-store-gateway-" + tag
105110
cli4, stdout4, stdoutPipe4 := dockercli.NewClient()
106111
defer cli4.CmdRm("-f", name)
@@ -114,7 +119,7 @@ func TestStore(t *testing.T) {
114119
"-e", "HOST="+host,
115120
"-e", "EXTERNAL_PORT="+port,
116121
"-e", "ETCD_PORT="+etcdPort,
117-
"deis/store-gateway:"+tag)
122+
imageName)
118123
}()
119124
dockercli.PrintToStdout(t, stdout4, stdoutPipe4, "deis-store-gateway running...")
120125
if err != nil {

‎tests/mock/mock.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ func RunMockDatabase(t *testing.T, tag string, etcdPort string, dbPort string) {
5353
// RunMockCeph runs a container used to mock a Ceph storage cluster
5454
func RunMockCeph(t *testing.T, name string, cli *client.DockerCli, etcdPort string) {
5555

56+
storeImage := utils.ImagePrefix() + "mock-store:latest"
5657
etcdutils.SetSingle(t, "/deis/store/hosts/"+utils.HostAddress(), utils.HostAddress(), etcdPort)
5758
var err error
5859
cli, stdout, stdoutPipe := dockercli.NewClient()
5960
ipaddr := utils.HostAddress()
60-
fmt.Printf("--- Running deis/mock-store at %s\n", ipaddr)
61+
fmt.Printf("--- Running %s at %s\n", storeImage, ipaddr)
6162
done := make(chan bool, 1)
6263
go func() {
6364
done <- true
@@ -67,7 +68,7 @@ func RunMockCeph(t *testing.T, name string, cli *client.DockerCli, etcdPort stri
6768
"-e", "HOST="+ipaddr,
6869
"-e", "ETCD_PORT="+etcdPort,
6970
"--net=host",
70-
"deis/mock-store:latest")
71+
storeImage)
7172
}()
7273
dockercli.PrintToStdout(t, stdout, stdoutPipe, "deis-store-gateway running...")
7374
if err != nil {

0 commit comments

Comments
 (0)