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

Update Couchbase Server EE to 6.5.0 #7308

Merged
merged 1 commit into from
Jan 21, 2020
Merged

Conversation

udkyo
Copy link
Contributor

@udkyo udkyo commented Jan 21, 2020

No description provided.

@ceejatec
Copy link
Contributor

@tianon @yosifkit If there's any way this could be expedited we'd really appreciate it - our go-live for Couchbase Server 6.5.0 is today!

@tianon
Copy link
Member

tianon commented Jan 21, 2020

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 08b1349..84312ca 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,2 @@
-couchbase:6.5.0-beta2 @ amd64
 couchbase:community-6.0.0 @ amd64
-couchbase:enterprise-6.0.3 @ amd64
+couchbase:enterprise-6.5.0 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 726f179..b33a127 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,6 @@
-couchbase:6.0.3
-couchbase:6.5.0-beta2
+couchbase:6.5.0
 couchbase:community
 couchbase:community-6.0.0
 couchbase:enterprise
-couchbase:enterprise-6.0.3
+couchbase:enterprise-6.5.0
 couchbase:latest
diff --git a/couchbase_enterprise-6.0.3/Dockerfile b/couchbase_enterprise-6.0.3/Dockerfile
deleted file mode 100644
index 265e895..0000000
diff --git a/couchbase_enterprise-6.0.3/scripts/dummy.sh b/couchbase_enterprise-6.0.3/scripts/dummy.sh
deleted file mode 100755
index 0091b80..0000000
diff --git a/couchbase_enterprise-6.0.3/scripts/entrypoint.sh b/couchbase_enterprise-6.0.3/scripts/entrypoint.sh
deleted file mode 100755
index 25dea8d..0000000
diff --git a/couchbase_enterprise-6.0.3/scripts/run b/couchbase_enterprise-6.0.3/scripts/run
deleted file mode 100755
index a5535cf..0000000
diff --git a/couchbase_6.5.0-beta2/Dockerfile b/couchbase_enterprise-6.5.0/Dockerfile
similarity index 93%
rename from couchbase_6.5.0-beta2/Dockerfile
rename to couchbase_enterprise-6.5.0/Dockerfile
index 12981b1..180a381 100644
--- a/couchbase_6.5.0-beta2/Dockerfile
+++ b/couchbase_enterprise-6.5.0/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=6.5.0-beta2
-ARG CB_RELEASE_URL=https://packages.couchbase.com/releases/6.5.0-beta2
-ARG CB_PACKAGE=couchbase-server-enterprise_6.5.0-beta2-ubuntu16.04_amd64.deb
-ARG CB_SHA256=08aba6dfbacc6d4a217996753d47c852ca24a4a628eb2b073538fe3a3c9ccbc4
+ARG CB_VERSION=6.5.0
+ARG CB_RELEASE_URL=https://packages.couchbase.com/releases/6.5.0
+ARG CB_PACKAGE=couchbase-server-enterprise_6.5.0-ubuntu16.04_amd64.deb
+ARG CB_SHA256=5505c6bb026090dae7351e9d83caeab00437f19e48e826afd4cb6bafc484cd2b
 
 ENV PATH=$PATH:/opt/couchbase/bin:/opt/couchbase/bin/tools:/opt/couchbase/bin/install
 
diff --git a/couchbase_6.5.0-beta2/scripts/dummy.sh b/couchbase_enterprise-6.5.0/scripts/dummy.sh
similarity index 100%
rename from couchbase_6.5.0-beta2/scripts/dummy.sh
rename to couchbase_enterprise-6.5.0/scripts/dummy.sh
diff --git a/couchbase_6.5.0-beta2/scripts/entrypoint.sh b/couchbase_enterprise-6.5.0/scripts/entrypoint.sh
similarity index 100%
rename from couchbase_6.5.0-beta2/scripts/entrypoint.sh
rename to couchbase_enterprise-6.5.0/scripts/entrypoint.sh
diff --git a/couchbase_6.5.0-beta2/scripts/run b/couchbase_enterprise-6.5.0/scripts/run
similarity index 100%
rename from couchbase_6.5.0-beta2/scripts/run
rename to couchbase_enterprise-6.5.0/scripts/run

@tianon
Copy link
Member

tianon commented Jan 21, 2020

LGTM

Build test of #7308; 78c0d5b; amd64 (couchbase):

$ bashbrew build couchbase:latest
Building bashbrew/cache:cd0ffb142925caa635d0926108ad35b5423465c268f58bac2c5ad57450fbdecd (couchbase:latest)
Tagging couchbase:latest
Tagging couchbase:enterprise
Tagging couchbase:6.5.0
Tagging couchbase:enterprise-6.5.0

$ 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:dc24bebaf8ec89ce760996591bcd9cb941984cc7e80f96093bd74d86a61c950c (couchbase:community)
Tagging couchbase:community
Tagging couchbase:community-6.0.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

@tianon tianon merged commit fef6a63 into docker-library:master Jan 21, 2020
@ceejatec
Copy link
Contributor

@tianon Thanks for the fast turnaround! Do you know about how long it usually takes for the new image tags to appear on Docker Hub?

@ceejatec
Copy link
Contributor

Actually looks like the image is live now - awesome! Thanks again.

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.

4 participants