Use ubuntu 14.04 for Couchbase Server 4.x

Traun Leyden · Traun Leyden · commit 30cfda6e59fa · 2016-01-19T15:12:19.000-08:00
couchbase#28
diff --git a/community/couchbase-server/4.0.0/Dockerfile b/community/couchbase-server/4.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 MAINTAINER Couchbase Docker Team <docker@couchbase.com>
 
diff --git a/enterprise/couchbase-server/4.0.0-beta/Dockerfile b/enterprise/couchbase-server/4.0.0-beta/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 MAINTAINER Couchbase Docker Team <docker@couchbase.com>
 
diff --git a/enterprise/couchbase-server/4.0.0-dp/Dockerfile b/enterprise/couchbase-server/4.0.0-dp/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 MAINTAINER Couchbase Docker Team <docker@couchbase.com>
 
diff --git a/enterprise/couchbase-server/4.0.0-rc0/Dockerfile b/enterprise/couchbase-server/4.0.0-rc0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 MAINTAINER Couchbase Docker Team <docker@couchbase.com>
 
diff --git a/enterprise/couchbase-server/4.0.0/Dockerfile b/enterprise/couchbase-server/4.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 MAINTAINER Couchbase Docker Team <docker@couchbase.com>
 
diff --git a/enterprise/couchbase-server/4.1.0/Dockerfile b/enterprise/couchbase-server/4.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
 MAINTAINER Couchbase Docker Team <docker@couchbase.com>
 
diff --git a/generate/generator/generate.go b/generate/generator/generate.go
@@ -364,6 +364,9 @@ func (variant DockerfileVariant) dockerBaseImage() string {
 	case ProductServer:
 		// TODO: maybe for Couchbase 4.x, we can change this to Ubuntu 14.04?
 		// See https://github.com/couchbase/docker/pull/28
+		if strings.HasPrefix(variant.Version, "4") {
+			return "ubuntu:14.04"
+		}
 		return "ubuntu:12.04"
 	default:
 		panic("Unexpected product")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:12.04`
	`1`	`+FROM ubuntu:14.04`
`2`	`2`
`3`	`3`	`MAINTAINER Couchbase Docker Team <[email protected]>`
`4`	`4`