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

Bump Couchbase Enterprise to 4.6.1 #2743

Merged
merged 1 commit into from
Mar 14, 2017
Merged

Conversation

ceejatec
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

diff --git a/_bashbrew-list b/_bashbrew-list
index dae7320..4f4dbed 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,9 @@
 couchbase:3.1.6
-couchbase:4.6.0
+couchbase:4.6.1
 couchbase:community
 couchbase:community-3.1.3
 couchbase:community-4.5.0
 couchbase:enterprise
 couchbase:enterprise-3.1.6
-couchbase:enterprise-4.6.0
+couchbase:enterprise-4.6.1
 couchbase:latest
diff --git a/couchbase_enterprise-4.6.0/Dockerfile b/couchbase_enterprise-4.6.1/Dockerfile
similarity index 93%
rename from couchbase_enterprise-4.6.0/Dockerfile
rename to couchbase_enterprise-4.6.1/Dockerfile
index 79077e8..af6d64d 100644
--- a/couchbase_enterprise-4.6.0/Dockerfile
+++ b/couchbase_enterprise-4.6.1/Dockerfile
@@ -19,10 +19,10 @@ RUN apt-get update && \
     apt-get autoremove && apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ARG CB_VERSION=4.6.0
+ARG CB_VERSION=4.6.1
 ARG CB_RELEASE_URL=http://packages.couchbase.com/releases
-ARG CB_PACKAGE=couchbase-server-enterprise_4.6.0-ubuntu14.04_amd64.deb
-ARG CB_SHA256=f798fea39c6d693f1912c88c2195001373b5514f776e74599116cad392739028
+ARG CB_PACKAGE=couchbase-server-enterprise_4.6.1-ubuntu14.04_amd64.deb
+ARG CB_SHA256=2c11c40424f9ddfe5a3821932215d0ae8d0151aa050b8f4e863fe74b88b988bf
 
 ENV PATH=$PATH:/opt/couchbase/bin:/opt/couchbase/bin/tools:/opt/couchbase/bin/install
 
diff --git a/couchbase_enterprise-4.6.0/scripts/dummy.sh b/couchbase_enterprise-4.6.1/scripts/dummy.sh
similarity index 100%
rename from couchbase_enterprise-4.6.0/scripts/dummy.sh
rename to couchbase_enterprise-4.6.1/scripts/dummy.sh
diff --git a/couchbase_enterprise-4.6.0/scripts/entrypoint.sh b/couchbase_enterprise-4.6.1/scripts/entrypoint.sh
similarity index 100%
rename from couchbase_enterprise-4.6.0/scripts/entrypoint.sh
rename to couchbase_enterprise-4.6.1/scripts/entrypoint.sh
diff --git a/couchbase_enterprise-4.6.0/scripts/run b/couchbase_enterprise-4.6.1/scripts/run
similarity index 100%
rename from couchbase_enterprise-4.6.0/scripts/run
rename to couchbase_enterprise-4.6.1/scripts/run

@yosifkit
Copy link
Member

Build test of #2743; 6bcfa41 (couchbase):

$ bashbrew build couchbase:latest
Building bashbrew/cache:8b429466162c2bf5723d2fb9cccd5eee6e0ab1ba660e257ccb5cac62d80bb045 (couchbase:latest)
Tagging couchbase:latest
Tagging couchbase:enterprise
Tagging couchbase:4.6.1
Tagging couchbase:enterprise-4.6.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:community
Building bashbrew/cache:d1fdfa41be75540280151fd935f0634ff4a437168c985db6d18901b08500d9af (couchbase:community)
Tagging couchbase:community
Tagging couchbase:community-4.5.0

$ 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:3.1.6
Building bashbrew/cache:2032748f46420284d780479a7630b17ef5d7fde03efb45f1c53820f23c8bcb31 (couchbase:3.1.6)
Tagging couchbase:3.1.6
Tagging couchbase:enterprise-3.1.6

$ test/run.sh couchbase:3.1.6
testing couchbase:3.1.6
	'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-3.1.3
Building bashbrew/cache:5e329dca6b05a0923cd2c27bfc5d81b0b3cbb8cd25d5ed4f2e00c5fd88130ab7 (couchbase:community-3.1.3)
Tagging couchbase:community-3.1.3

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

@yosifkit yosifkit merged commit eb622c0 into docker-library:master Mar 14, 2017
@ceejatec
Copy link
Contributor Author

Thanks!

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