From 613dbe0a692ac0573533b4fb4e978bcd71049984 Mon Sep 17 00:00:00 2001 From: Chris Hillery Date: Tue, 5 Jun 2018 02:00:46 -0700 Subject: [PATCH] MB-29814: Add tzdata to Server image --- community/couchbase-server/2.2.0/Dockerfile | 3 ++- community/couchbase-server/3.0.1/Dockerfile | 3 ++- community/couchbase-server/3.1.3/Dockerfile | 3 ++- community/couchbase-server/4.0.0/Dockerfile | 3 ++- community/couchbase-server/4.1.0/Dockerfile | 3 ++- community/couchbase-server/4.1.1/Dockerfile | 3 ++- community/couchbase-server/4.5.0/Dockerfile | 3 ++- community/couchbase-server/4.5.1/Dockerfile | 3 ++- community/couchbase-server/5.0.1/Dockerfile | 3 ++- enterprise/couchbase-server/2.5.2/Dockerfile | 3 ++- enterprise/couchbase-server/3.0.2/Dockerfile | 3 ++- enterprise/couchbase-server/3.0.3/Dockerfile | 3 ++- enterprise/couchbase-server/3.1.0/Dockerfile | 3 ++- enterprise/couchbase-server/3.1.3/Dockerfile | 3 ++- enterprise/couchbase-server/3.1.5/Dockerfile | 3 ++- enterprise/couchbase-server/3.1.6/Dockerfile | 3 ++- enterprise/couchbase-server/4.0.0/Dockerfile | 3 ++- enterprise/couchbase-server/4.1.0/Dockerfile | 3 ++- enterprise/couchbase-server/4.1.1/Dockerfile | 3 ++- enterprise/couchbase-server/4.1.2/Dockerfile | 3 ++- enterprise/couchbase-server/4.5.0/Dockerfile | 3 ++- enterprise/couchbase-server/4.5.1/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.0-DP/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.0/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.1/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.2/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.3/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.4/Dockerfile | 3 ++- enterprise/couchbase-server/4.6.5/Dockerfile | 3 ++- enterprise/couchbase-server/5.0.1/Dockerfile | 3 ++- enterprise/couchbase-server/5.1.0/Dockerfile | 3 ++- enterprise/couchbase-server/5.1.1/Dockerfile | 3 ++- enterprise/couchbase-server/5.5.0-Mar/Dockerfile | 3 ++- enterprise/couchbase-server/5.5.0-beta/Dockerfile | 3 ++- generate/templates/couchbase-server/Dockerfile.template | 3 ++- 35 files changed, 70 insertions(+), 35 deletions(-) diff --git a/community/couchbase-server/2.2.0/Dockerfile b/community/couchbase-server/2.2.0/Dockerfile index 7bee2d12e..23543a52b 100644 --- a/community/couchbase-server/2.2.0/Dockerfile +++ b/community/couchbase-server/2.2.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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 librtmp0 && \ apt-get autoremove && apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/community/couchbase-server/3.0.1/Dockerfile b/community/couchbase-server/3.0.1/Dockerfile index 3ff175479..f2600b8c3 100644 --- a/community/couchbase-server/3.0.1/Dockerfile +++ b/community/couchbase-server/3.0.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/3.1.3/Dockerfile b/community/couchbase-server/3.1.3/Dockerfile index 72195f0e3..e2a90a153 100644 --- a/community/couchbase-server/3.1.3/Dockerfile +++ b/community/couchbase-server/3.1.3/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/4.0.0/Dockerfile b/community/couchbase-server/4.0.0/Dockerfile index 8bfece652..5664899a7 100644 --- a/community/couchbase-server/4.0.0/Dockerfile +++ b/community/couchbase-server/4.0.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/4.1.0/Dockerfile b/community/couchbase-server/4.1.0/Dockerfile index b547ae7ff..1f0c37cac 100644 --- a/community/couchbase-server/4.1.0/Dockerfile +++ b/community/couchbase-server/4.1.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/4.1.1/Dockerfile b/community/couchbase-server/4.1.1/Dockerfile index d07f18935..c9a9cae83 100644 --- a/community/couchbase-server/4.1.1/Dockerfile +++ b/community/couchbase-server/4.1.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/4.5.0/Dockerfile b/community/couchbase-server/4.5.0/Dockerfile index c954289f3..2958ddf9b 100644 --- a/community/couchbase-server/4.5.0/Dockerfile +++ b/community/couchbase-server/4.5.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/4.5.1/Dockerfile b/community/couchbase-server/4.5.1/Dockerfile index f829aeb16..c9ce14148 100644 --- a/community/couchbase-server/4.5.1/Dockerfile +++ b/community/couchbase-server/4.5.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/community/couchbase-server/5.0.1/Dockerfile b/community/couchbase-server/5.0.1/Dockerfile index 83dc51452..c5ef91df7 100644 --- a/community/couchbase-server/5.0.1/Dockerfile +++ b/community/couchbase-server/5.0.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/2.5.2/Dockerfile b/enterprise/couchbase-server/2.5.2/Dockerfile index f58e6cf63..db76dd11c 100644 --- a/enterprise/couchbase-server/2.5.2/Dockerfile +++ b/enterprise/couchbase-server/2.5.2/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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 librtmp0 && \ apt-get autoremove && apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/enterprise/couchbase-server/3.0.2/Dockerfile b/enterprise/couchbase-server/3.0.2/Dockerfile index a7fff1fc7..aa2e801a1 100644 --- a/enterprise/couchbase-server/3.0.2/Dockerfile +++ b/enterprise/couchbase-server/3.0.2/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/3.0.3/Dockerfile b/enterprise/couchbase-server/3.0.3/Dockerfile index 7ba42f263..5e5f2e684 100644 --- a/enterprise/couchbase-server/3.0.3/Dockerfile +++ b/enterprise/couchbase-server/3.0.3/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/3.1.0/Dockerfile b/enterprise/couchbase-server/3.1.0/Dockerfile index 7ca8c05b4..d6ad4ff38 100644 --- a/enterprise/couchbase-server/3.1.0/Dockerfile +++ b/enterprise/couchbase-server/3.1.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/3.1.3/Dockerfile b/enterprise/couchbase-server/3.1.3/Dockerfile index 151fb3802..e7f3ee278 100644 --- a/enterprise/couchbase-server/3.1.3/Dockerfile +++ b/enterprise/couchbase-server/3.1.3/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/3.1.5/Dockerfile b/enterprise/couchbase-server/3.1.5/Dockerfile index 861a5bbfb..1f80a940f 100644 --- a/enterprise/couchbase-server/3.1.5/Dockerfile +++ b/enterprise/couchbase-server/3.1.5/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/3.1.6/Dockerfile b/enterprise/couchbase-server/3.1.6/Dockerfile index 3db2e98ae..55f980e30 100644 --- a/enterprise/couchbase-server/3.1.6/Dockerfile +++ b/enterprise/couchbase-server/3.1.6/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.0.0/Dockerfile b/enterprise/couchbase-server/4.0.0/Dockerfile index 1ef8c79f6..c4b073b06 100644 --- a/enterprise/couchbase-server/4.0.0/Dockerfile +++ b/enterprise/couchbase-server/4.0.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.1.0/Dockerfile b/enterprise/couchbase-server/4.1.0/Dockerfile index 872e85030..34f84a016 100644 --- a/enterprise/couchbase-server/4.1.0/Dockerfile +++ b/enterprise/couchbase-server/4.1.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.1.1/Dockerfile b/enterprise/couchbase-server/4.1.1/Dockerfile index 369180323..d76b63493 100644 --- a/enterprise/couchbase-server/4.1.1/Dockerfile +++ b/enterprise/couchbase-server/4.1.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.1.2/Dockerfile b/enterprise/couchbase-server/4.1.2/Dockerfile index 3f90ea631..9a53c876b 100644 --- a/enterprise/couchbase-server/4.1.2/Dockerfile +++ b/enterprise/couchbase-server/4.1.2/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.5.0/Dockerfile b/enterprise/couchbase-server/4.5.0/Dockerfile index 097a45408..8cbd2d338 100644 --- a/enterprise/couchbase-server/4.5.0/Dockerfile +++ b/enterprise/couchbase-server/4.5.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.5.1/Dockerfile b/enterprise/couchbase-server/4.5.1/Dockerfile index 5acd22e80..eadedc977 100644 --- a/enterprise/couchbase-server/4.5.1/Dockerfile +++ b/enterprise/couchbase-server/4.5.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.0-DP/Dockerfile b/enterprise/couchbase-server/4.6.0-DP/Dockerfile index 34ed3aa6d..5a98d2c48 100644 --- a/enterprise/couchbase-server/4.6.0-DP/Dockerfile +++ b/enterprise/couchbase-server/4.6.0-DP/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.0/Dockerfile b/enterprise/couchbase-server/4.6.0/Dockerfile index a9f437572..230ace22a 100644 --- a/enterprise/couchbase-server/4.6.0/Dockerfile +++ b/enterprise/couchbase-server/4.6.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.1/Dockerfile b/enterprise/couchbase-server/4.6.1/Dockerfile index 059d64c44..5c901a13e 100644 --- a/enterprise/couchbase-server/4.6.1/Dockerfile +++ b/enterprise/couchbase-server/4.6.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.2/Dockerfile b/enterprise/couchbase-server/4.6.2/Dockerfile index cc1d20be5..fc0c68288 100644 --- a/enterprise/couchbase-server/4.6.2/Dockerfile +++ b/enterprise/couchbase-server/4.6.2/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.3/Dockerfile b/enterprise/couchbase-server/4.6.3/Dockerfile index d5110381d..ca75c5aff 100644 --- a/enterprise/couchbase-server/4.6.3/Dockerfile +++ b/enterprise/couchbase-server/4.6.3/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.4/Dockerfile b/enterprise/couchbase-server/4.6.4/Dockerfile index 1a532fbe7..03d805887 100644 --- a/enterprise/couchbase-server/4.6.4/Dockerfile +++ b/enterprise/couchbase-server/4.6.4/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/4.6.5/Dockerfile b/enterprise/couchbase-server/4.6.5/Dockerfile index 2e7d3cb4a..0e1094c25 100644 --- a/enterprise/couchbase-server/4.6.5/Dockerfile +++ b/enterprise/couchbase-server/4.6.5/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/5.0.1/Dockerfile b/enterprise/couchbase-server/5.0.1/Dockerfile index a30947529..545f524ee 100644 --- a/enterprise/couchbase-server/5.0.1/Dockerfile +++ b/enterprise/couchbase-server/5.0.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/5.1.0/Dockerfile b/enterprise/couchbase-server/5.1.0/Dockerfile index 55d930202..e531f5f09 100644 --- a/enterprise/couchbase-server/5.1.0/Dockerfile +++ b/enterprise/couchbase-server/5.1.0/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/5.1.1/Dockerfile b/enterprise/couchbase-server/5.1.1/Dockerfile index 3591fb4b5..ce65e5569 100644 --- a/enterprise/couchbase-server/5.1.1/Dockerfile +++ b/enterprise/couchbase-server/5.1.1/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/5.5.0-Mar/Dockerfile b/enterprise/couchbase-server/5.5.0-Mar/Dockerfile index 2814d52ae..0156ee84e 100644 --- a/enterprise/couchbase-server/5.5.0-Mar/Dockerfile +++ b/enterprise/couchbase-server/5.5.0-Mar/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/enterprise/couchbase-server/5.5.0-beta/Dockerfile b/enterprise/couchbase-server/5.5.0-beta/Dockerfile index dbd81b9f7..fb07ea1d8 100644 --- a/enterprise/couchbase-server/5.5.0-beta/Dockerfile +++ b/enterprise/couchbase-server/5.5.0-beta/Dockerfile @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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/generate/templates/couchbase-server/Dockerfile.template b/generate/templates/couchbase-server/Dockerfile.template index ba3d60e24..ca7e9a957 100644 --- a/generate/templates/couchbase-server/Dockerfile.template +++ b/generate/templates/couchbase-server/Dockerfile.template @@ -7,6 +7,7 @@ MAINTAINER Couchbase Docker Team # 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 # 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 {{ .CB_EXTRA_DEPS }} && \ apt-get autoremove && apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*