Skip to content

Conversation

mhocouchbase
Copy link
Contributor

Add Couchbase Server EE 7.2.3 as latest
Add Couchbase Server EE 7.1.6

-Ming

Add Couchbase Server EE 7.1.6

-Ming
Copy link

Diff for 1be50b5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b98aac6..c5bc11e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,15 +9,15 @@ Tags: 7.0.5, enterprise-7.0.5
 GitCommit: ca816b6ffa5c36007bd4b3386ec24df081a00ea0
 Directory: enterprise/couchbase-server/7.0.5
 
-Tags: 7.1.5, enterprise-7.1.5
+Tags: 7.1.6, enterprise-7.1.6
 Architectures: amd64, arm64v8
-GitCommit: 1ce6c78f29c9be97c67c2588b1ceaa57ad1b49c6
-Directory: enterprise/couchbase-server/7.1.5
+GitCommit: 3b28b68159ef2e9007a1493c17e768fbb4837358
+Directory: enterprise/couchbase-server/7.1.6
 
-Tags: 7.2.2, enterprise-7.2.2, enterprise, latest
+Tags: 7.2.3, enterprise-7.2.3, enterprise, latest
 Architectures: amd64, arm64v8
-GitCommit: 855d163127ee5e4bc6854714ecd6911f70f27906
-Directory: enterprise/couchbase-server/7.2.2
+GitCommit: 3a446520433f63e3d270f01063b14cb6b6ade12a
+Directory: enterprise/couchbase-server/7.2.3
 
 Tags: community-6.6.0
 GitCommit: aad4aa9714578906c0c993121654eaeba0bd907c
diff --git a/_bashbrew-list b/_bashbrew-list
index 34056a3..7d74835 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 couchbase:6.6.6
 couchbase:7.0.5
-couchbase:7.1.5
-couchbase:7.2.2
+couchbase:7.1.6
+couchbase:7.2.3
 couchbase:community
 couchbase:community-6.6.0
 couchbase:community-7.0.2
@@ -10,6 +10,6 @@ couchbase:community-7.2.2
 couchbase:enterprise
 couchbase:enterprise-6.6.6
 couchbase:enterprise-7.0.5
-couchbase:enterprise-7.1.5
-couchbase:enterprise-7.2.2
+couchbase:enterprise-7.1.6
+couchbase:enterprise-7.2.3
 couchbase:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d390960..b3832d3 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
 couchbase:enterprise-6.6.6
 couchbase:enterprise-7.0.5
-couchbase:enterprise-7.1.5
+couchbase:enterprise-7.1.6
 couchbase:latest
 couchbase:community-6.6.0
 couchbase:community-7.0.2
diff --git a/couchbase_enterprise-7.1.5/Dockerfile b/couchbase_enterprise-7.1.6/Dockerfile
similarity index 93%
rename from couchbase_enterprise-7.1.5/Dockerfile
rename to couchbase_enterprise-7.1.6/Dockerfile
index d4bc455..644629e 100644
--- a/couchbase_enterprise-7.1.5/Dockerfile
+++ b/couchbase_enterprise-7.1.6/Dockerfile
@@ -21,8 +21,8 @@ RUN set -x \
       lsof lshw sysstat net-tools numactl bzip2 runit \
     && ${CLEANUP_COMMAND}
 
-ARG CB_RELEASE_URL=https://packages.couchbase.com/releases/7.1.5
-ARG CB_PACKAGE=couchbase-server-enterprise_7.1.5-linux_@@ARCH@@.deb
+ARG CB_RELEASE_URL=https://packages.couchbase.com/releases/7.1.6
+ARG CB_PACKAGE=couchbase-server-enterprise_7.1.6-linux_@@ARCH@@.deb
 ARG CB_SKIP_CHECKSUM=false
 ENV PATH=$PATH:/opt/couchbase/bin:/opt/couchbase/bin/tools:/opt/couchbase/bin/install
 
@@ -36,10 +36,10 @@ RUN set -x \
     && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch}" in \
          'arm64') \
-           CB_SHA256=57ecac55aca0abf1e6f0a62ebdcd24514cf0d87d09498d794b047d533719321a \
+           CB_SHA256=d4462e7228c372f761bd83f96fa63a7211544df885c2d2e065202ff663dad6f9 \
            ;; \
          'amd64') \
-           CB_SHA256=b4e3a4f7d10b34471a7ba8a03ac658e79778aaf6b091c9c1631a5c4548e102e0 \
+           CB_SHA256=abf410a1f97dd14171cd260d4abb853be003db5ec0a44c8324c846068eb90ce7 \
            ;; \
        esac \
     && CB_PACKAGE=$(echo ${CB_PACKAGE} | sed -e "s/@@ARCH@@/${dpkgArch}/") \
diff --git a/couchbase_enterprise-7.1.5/scripts/dummy.sh b/couchbase_enterprise-7.1.6/scripts/dummy.sh
similarity index 100%
rename from couchbase_enterprise-7.1.5/scripts/dummy.sh
rename to couchbase_enterprise-7.1.6/scripts/dummy.sh
diff --git a/couchbase_enterprise-7.1.5/scripts/entrypoint.sh b/couchbase_enterprise-7.1.6/scripts/entrypoint.sh
similarity index 100%
rename from couchbase_enterprise-7.1.5/scripts/entrypoint.sh
rename to couchbase_enterprise-7.1.6/scripts/entrypoint.sh
diff --git a/couchbase_enterprise-7.1.5/scripts/run b/couchbase_enterprise-7.1.6/scripts/run
similarity index 100%
rename from couchbase_enterprise-7.1.5/scripts/run
rename to couchbase_enterprise-7.1.6/scripts/run
diff --git a/couchbase_latest/Dockerfile b/couchbase_latest/Dockerfile
index 9ee4422..75a9027 100644
--- a/couchbase_latest/Dockerfile
+++ b/couchbase_latest/Dockerfile
@@ -21,8 +21,8 @@ RUN set -x \
       lsof lshw sysstat net-tools numactl bzip2 runit \
     && ${CLEANUP_COMMAND}
 
-ARG CB_RELEASE_URL=https://packages.couchbase.com/releases/7.2.2
-ARG CB_PACKAGE=couchbase-server-enterprise_7.2.2-linux_@@ARCH@@.deb
+ARG CB_RELEASE_URL=https://packages.couchbase.com/releases/7.2.3
+ARG CB_PACKAGE=couchbase-server-enterprise_7.2.3-linux_@@ARCH@@.deb
 ARG CB_SKIP_CHECKSUM=false
 ENV PATH=$PATH:/opt/couchbase/bin:/opt/couchbase/bin/tools:/opt/couchbase/bin/install
 
@@ -36,10 +36,10 @@ RUN set -x \
     && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch}" in \
          'arm64') \
-           CB_SHA256=73d9cb6389a878c83da2b697d8e3d5574f8249e689933139278dd27106d3edbf \
+           CB_SHA256=1ca43fd4d5c7d390974ba5ae0465875b4c42687dd497ceadb2ef6816585e3ec7 \
            ;; \
          'amd64') \
-           CB_SHA256=992bd6628e0b415a5fb47152845cdba412e0d2081eb250ce8a6e32edd0ca3152 \
+           CB_SHA256=941ad294cc93102b655290701e4f6f6c653c146dc525ade7c734047b3797e316 \
            ;; \
        esac \
     && CB_PACKAGE=$(echo ${CB_PACKAGE} | sed -e "s/@@ARCH@@/${dpkgArch}/") \

Relevant Maintainers:

@yosifkit
Copy link
Member

Invalid 'FROM' + 'Architectures' combinations detected:

- couchbase:community-6.6.0 (FROM ubuntu:18.04) -- completely unsupported base!

Failing test is expected: #15369 (comment).

Merging to get the update in, but I think since it is after October, 6.6.0 is fully EOL now and should be removed.

@yosifkit yosifkit merged commit 9b129a8 into docker-library:master Nov 10, 2023
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.

2 participants