Add tzdata to Couchbase Server images #4431
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/couchbase_5.5.0-beta/Dockerfile b/couchbase_5.5.0-beta/Dockerfile
index dbd81b9..fb07ea1 100644
--- a/couchbase_5.5.0-beta/Dockerfile
+++ b/couchbase_5.5.0-beta/Dockerfile
@@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# wget: for downloading .deb
# python-httplib2: used by CLI tools
# chrpath: for fixing curl, below
+# tzdata: timezone info used by some N1QL functions
# Additional dependencies for system commands used by cbcollect_info:
# lsof: lsof
# lshw: lshw
@@ -14,7 +15,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# net-tools: ifconfig, arp, netstat
# numactl: numactl
RUN apt-get update && \
- apt-get install -yq runit wget python-httplib2 chrpath \
+ apt-get install -yq runit wget python-httplib2 chrpath tzdata \
lsof lshw sysstat net-tools numactl && \
apt-get autoremove && apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/couchbase_community-4.5.1/Dockerfile b/couchbase_community-4.5.1/Dockerfile
index f829aeb..c9ce141 100644
--- a/couchbase_community-4.5.1/Dockerfile
+++ b/couchbase_community-4.5.1/Dockerfile
@@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# wget: for downloading .deb
# python-httplib2: used by CLI tools
# chrpath: for fixing curl, below
+# tzdata: timezone info used by some N1QL functions
# Additional dependencies for system commands used by cbcollect_info:
# lsof: lsof
# lshw: lshw
@@ -14,7 +15,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# net-tools: ifconfig, arp, netstat
# numactl: numactl
RUN apt-get update && \
- apt-get install -yq runit wget python-httplib2 chrpath \
+ apt-get install -yq runit wget python-httplib2 chrpath tzdata \
lsof lshw sysstat net-tools numactl && \
apt-get autoremove && apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/couchbase_community-5.0.1/Dockerfile b/couchbase_community-5.0.1/Dockerfile
index 83dc514..c5ef91d 100644
--- a/couchbase_community-5.0.1/Dockerfile
+++ b/couchbase_community-5.0.1/Dockerfile
@@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# wget: for downloading .deb
# python-httplib2: used by CLI tools
# chrpath: for fixing curl, below
+# tzdata: timezone info used by some N1QL functions
# Additional dependencies for system commands used by cbcollect_info:
# lsof: lsof
# lshw: lshw
@@ -14,7 +15,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# net-tools: ifconfig, arp, netstat
# numactl: numactl
RUN apt-get update && \
- apt-get install -yq runit wget python-httplib2 chrpath \
+ apt-get install -yq runit wget python-httplib2 chrpath tzdata \
lsof lshw sysstat net-tools numactl && \
apt-get autoremove && apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/couchbase_enterprise-4.6.5/Dockerfile b/couchbase_enterprise-4.6.5/Dockerfile
index 2e7d3cb..0e1094c 100644
--- a/couchbase_enterprise-4.6.5/Dockerfile
+++ b/couchbase_enterprise-4.6.5/Dockerfile
@@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# wget: for downloading .deb
# python-httplib2: used by CLI tools
# chrpath: for fixing curl, below
+# tzdata: timezone info used by some N1QL functions
# Additional dependencies for system commands used by cbcollect_info:
# lsof: lsof
# lshw: lshw
@@ -14,7 +15,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# net-tools: ifconfig, arp, netstat
# numactl: numactl
RUN apt-get update && \
- apt-get install -yq runit wget python-httplib2 chrpath \
+ apt-get install -yq runit wget python-httplib2 chrpath tzdata \
lsof lshw sysstat net-tools numactl && \
apt-get autoremove && apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/couchbase_enterprise-5.1.1/Dockerfile b/couchbase_enterprise-5.1.1/Dockerfile
index 3591fb4..ce65e55 100644
--- a/couchbase_enterprise-5.1.1/Dockerfile
+++ b/couchbase_enterprise-5.1.1/Dockerfile
@@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# wget: for downloading .deb
# python-httplib2: used by CLI tools
# chrpath: for fixing curl, below
+# tzdata: timezone info used by some N1QL functions
# Additional dependencies for system commands used by cbcollect_info:
# lsof: lsof
# lshw: lshw
@@ -14,7 +15,7 @@ MAINTAINER Couchbase Docker Team <docker@couchbase.com>
# net-tools: ifconfig, arp, netstat
# numactl: numactl
RUN apt-get update && \
- apt-get install -yq runit wget python-httplib2 chrpath \
+ apt-get install -yq runit wget python-httplib2 chrpath tzdata \
lsof lshw sysstat net-tools numactl && \
apt-get autoremove && apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* |
|
LGTM Build test of #4431; c84bb7b; $ bashbrew build couchbase:latest
Building bashbrew/cache:3d5fadde82d48b37ae11d9d915a3918e92a129d5d67ccf1ac712496bba581f9c (couchbase:latest)
Tagging couchbase:latest
Tagging couchbase:enterprise
Tagging couchbase:5.1.1
Tagging couchbase:enterprise-5.1.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:5.5.0-beta
Building bashbrew/cache:7e97a93056b524b17950202a9f045fc463d9310e161eb6bc11e99d597d6440a3 (couchbase:5.5.0-beta)
Tagging couchbase:5.5.0-beta
$ test/run.sh couchbase:5.5.0-beta
testing couchbase:5.5.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:0cd895b2f72710da6e958bfe78e0cd270189febc3104724a6a70f9890b50702b (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:b88efd7f341ed86ebdecd94d89b1beb1b7effd4dd521358d42fd2cb0c15ed0bb (couchbase:community)
Tagging couchbase:community
Tagging couchbase:community-5.0.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:c9dbacd7b2bdb5fbf2cefa0042b7dc59e1264d361a9336cc31c264b4f19084fe (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
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This improves the behaviour of certain N1QL queries.