From e2cda834960bf881a75ed4c8efde8c19a0aabc3e Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Mon, 17 Jul 2017 15:15:55 +0200 Subject: [PATCH] DEBIAN_FRONTEND=noninteractive to stop apt-get upgrade asking questions (#476) + Don't install unnecessary python modules + Bump etcd version + Fix etcd arguments and add missing python modules --- .travis.yml | 2 ++ Dockerfile | 12 ++++++------ docker/entrypoint.sh | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d81d2eb..ca96dbca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ install: echo -e 'HTTP/1.0 200 OK\nContent-Type: application/json\n\n{"servers":["127.0.0.1"],"port":2181}' \ | nc -l 8181 &> /dev/null done& + ZK_PID=$! } attempt_num=1 @@ -114,3 +115,4 @@ after_success: - fpv=$(basename $(readlink $HOME/virtualenv/python3.5)) && mv $HOME/mycache/${fpv} $HOME/virtualenv/${fpv} - coveralls - if [[ $TEST_SUITE != "behave" ]]; then python-codacy-coverage -r coverage.xml; fi + - if [[ $DCS == "exhibitor" ]]; then ~/mycache/zookeeper-${ZKVERSION}/bin/zkServer.sh stop; kill -9 $ZK_PID; fi diff --git a/Dockerfile b/Dockerfile index f075c605..8d99b11b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,14 @@ FROM postgres:9.6 MAINTAINER Alexander Kukushkin -RUN echo 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommend \ +RUN export DEBIAN_FRONTEND=noninteractive \ + && echo 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommend \ && apt-get update -y \ && apt-get upgrade -y \ - && apt-get install -y curl jq haproxy python-psycopg2 python-yaml python-requests \ - python-six python-dateutil python-urllib3 python-dnspython \ - python-pip python-setuptools python-kazoo python-prettytable python-wheel python \ + && apt-get install -y curl jq haproxy python-psycopg2 python-yaml python-requests python-six python-pysocks \ + python-dateutil python-pip python-setuptools python-prettytable python-wheel python-psutil python \ - && pip install python-etcd==0.4.3 python-consul==0.7.0 click tzlocal --upgrade \ + && pip install 'python-etcd>=0.4.3,<0.5' click tzlocal cdiff \ && mkdir -p /home/postgres \ && chown postgres:postgres /home/postgres \ @@ -21,7 +21,7 @@ RUN echo 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/a && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* /root/.cache -ENV ETCDVERSION 3.1.2 +ENV ETCDVERSION 3.2.3 RUN curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-amd64.tar.gz \ | tar xz -C /usr/local/bin --strip=1 --wildcards --no-anchored etcd etcdctl diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 5e5dac29..0796b70c 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -22,7 +22,7 @@ __EOF__ DOCKER_IP=$(hostname --ip-address) PATRONI_SCOPE=${PATRONI_SCOPE:-batman} -ETCD_ARGS="--data-dir /tmp/etcd.data -advertise-client-urls=http://${DOCKER_IP}:2379 -listen-client-urls=http://0.0.0.0:2379 -listen-peer-urls=http://0.0.0.0:2380" +ETCD_ARGS="--data-dir /tmp/etcd.data -advertise-client-urls=http://${DOCKER_IP}:2379 -listen-client-urls=http://0.0.0.0:2379" optspec=":vh-:" while getopts "$optspec" optchar; do