Add Couchbase Server 6.0.0 Beta

[ceejatec]

No description provided.

[tianon]

Diff:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index f9a71c6..8585749 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,4 @@
+couchbase:6.0.0-beta @ amd64
 couchbase:community-4.5.1 @ amd64
 couchbase:community-5.1.1 @ amd64
 couchbase:enterprise-4.6.5 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 0e69706..0c97ff9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,6 @@
 couchbase:4.6.5
 couchbase:5.5.1
+couchbase:6.0.0-beta
 couchbase:community
 couchbase:community-4.5.1
 couchbase:community-5.1.1
diff --git a/couchbase_enterprise-5.5.1/Dockerfile b/couchbase_6.0.0-beta/Dockerfile
similarity index 93%
copy from couchbase_enterprise-5.5.1/Dockerfile
copy to couchbase_6.0.0-beta/Dockerfile
index da516de..06a44bc 100644
--- a/couchbase_enterprise-5.5.1/Dockerfile
+++ b/couchbase_6.0.0-beta/Dockerfile
@@ -20,10 +20,10 @@ RUN apt-get update && \
     apt-get autoremove && apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ARG CB_VERSION=5.5.1
+ARG CB_VERSION=6.0.0-beta
 ARG CB_RELEASE_URL=https://packages.couchbase.com/releases
-ARG CB_PACKAGE=couchbase-server-enterprise_5.5.1-ubuntu16.04_amd64.deb
-ARG CB_SHA256=d1db2051d530a1769982a9042acb17cc7ac1d0beb1c71f1c6214186212237ce6
+ARG CB_PACKAGE=couchbase-server-enterprise_6.0.0-beta-ubuntu16.04_amd64.deb
+ARG CB_SHA256=e62ddf1d7f7b520d4d5de192baff29cdaafed647bb632f98efdd909cf9f15d7c
 
 ENV PATH=$PATH:/opt/couchbase/bin:/opt/couchbase/bin/tools:/opt/couchbase/bin/install
 
diff --git a/couchbase_community-4.5.1/scripts/dummy.sh b/couchbase_6.0.0-beta/scripts/dummy.sh
similarity index 100%
copy from couchbase_community-4.5.1/scripts/dummy.sh
copy to couchbase_6.0.0-beta/scripts/dummy.sh
diff --git a/couchbase_community-4.5.1/scripts/entrypoint.sh b/couchbase_6.0.0-beta/scripts/entrypoint.sh
similarity index 100%
copy from couchbase_community-4.5.1/scripts/entrypoint.sh
copy to couchbase_6.0.0-beta/scripts/entrypoint.sh
diff --git a/couchbase_community-4.5.1/scripts/run b/couchbase_6.0.0-beta/scripts/run
similarity index 100%
copy from couchbase_community-4.5.1/scripts/run
copy to couchbase_6.0.0-beta/scripts/run

[tianon]

LGTM

Build test of #4754; 74262cb; amd64 (couchbase):

$ bashbrew build couchbase:latest
Building bashbrew/cache:bd6d113477400279fb45b23b8e7ef703cec1aa2aedb46ba8289f65b35f2b2176 (couchbase:latest)
Tagging couchbase:latest
Tagging couchbase:enterprise
Tagging couchbase:5.5.1
Tagging couchbase:enterprise-5.5.1

$ test/run.sh couchbase:latest
testing couchbase:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build couchbase:6.0.0-beta
Building bashbrew/cache:53dfe341d7dd6295f2142485833c74363d36359cdcab4bf90c0d43bc94cef308 (couchbase:6.0.0-beta)
Tagging couchbase:6.0.0-beta

$ test/run.sh couchbase:6.0.0-beta
testing couchbase:6.0.0-beta
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build couchbase:4.6.5
Building bashbrew/cache:693cce46cbbff6aa52035fcfca0b99c554d8d7e7f5c4b835bf987a7127895a04 (couchbase:4.6.5)
Tagging couchbase:4.6.5
Tagging couchbase:enterprise-4.6.5

$ test/run.sh couchbase:4.6.5
testing couchbase:4.6.5
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build couchbase:community
Building bashbrew/cache:19b6237e8a1e97e21b645545f81a53ed8325ac8a37b1ee00735f0a05bca75cce (couchbase:community)
Tagging couchbase:community
Tagging couchbase:community-5.1.1

$ test/run.sh couchbase:community
testing couchbase:community
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build couchbase:community-4.5.1
Building bashbrew/cache:f146cc8fe34f7fdf41760496316604f6ff05011fac45e7e42f789eb745a68378 (couchbase:community-4.5.1)
Tagging couchbase:community-4.5.1

$ test/run.sh couchbase:community-4.5.1
testing couchbase:community-4.5.1
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

[ceejatec]

@tianon Sadly we just discovered a problem with our beta build. Is there any way to undo this merge? If not, should I propose a new change to remove that 6.0.0-beta tag?

[tianon]

Sure, you (or I) can file a revert, and if the tags are built/pushed already we can remove them if you think it's necessary to go to that level (although the revert will remove them from the "Supported tags" list in the description, which might be enough?)

[ceejatec]

@tianon Just pushed a revert commit, and it looks like it got added to this same PR which confuses me a little bit, but does that work?

[tianon]

We can't reopen/remerge this, but you should be able to use that same branch in a new PR.

[ceejatec]

Got it. Re-proposed as #4759 . Thanks for the quick help! I expect we'll be re-re-proposing a fixed image fairly shortly.