Skip to content

Commit a4c6409

Browse files
author
Traun Leyden
committed
Future proof the ubuntu base docker image version
This change will use ubuntu 14.04 for couchbase 4.x and later.
1 parent 30cfda6 commit a4c6409

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

generate/generator/generate.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -362,12 +362,10 @@ func (variant DockerfileVariant) dockerBaseImage() string {
362362
}
363363
return "centos:centos7"
364364
case ProductServer:
365-
// TODO: maybe for Couchbase 4.x, we can change this to Ubuntu 14.04?
366-
// See https://github.com/couchbase/docker/pull/28
367-
if strings.HasPrefix(variant.Version, "4") {
368-
return "ubuntu:14.04"
365+
if strings.HasPrefix(variant.Version, "2") || strings.HasPrefix(variant.Version, "3") {
366+
return "ubuntu:12.04"
369367
}
370-
return "ubuntu:12.04"
368+
return "ubuntu:14.04"
371369
default:
372370
panic("Unexpected product")
373371
}

0 commit comments

Comments
 (0)