Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Couchbase Server 6.0.0 Beta #4761

Merged
merged 1 commit into from
Aug 23, 2018
Merged

Conversation

ceejatec
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Aug 23, 2018

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..2e537ed 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=11c6d084f8c732993e1d8bb211a4f95eeae5eac5152521cc953ce728be3719dd
 
 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
Copy link
Member

tianon commented Aug 23, 2018

LGTM

Build test of #4761; 23dfd69; amd64 (couchbase):

$ bashbrew build couchbase:latest
Building bashbrew/cache:8ec80e18353eac03b5856707e6e7f0e24c1d70d9aa5fef8008139f7979cc9769 (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:e140d56952b647abef99c0c267ccb0a8b41c50cef06d59f656f22ef46f42f569 (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:5bbcac3ac56d9946ca53a67ce477b5aeb043d76a3330c0f97b099fe55b74c795 (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:06f2dddc901bdd0b0d5e06ec967c778e934d4cfc878ac47720552783ec5248d6 (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:a226a3d404a868a00c06b3c0395c353cac9d70f0055421dd4ae154b151937150 (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

@tianon tianon merged commit 3c795f7 into docker-library:master Aug 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants