From c2f020500a7fb2edff1f182792f6cb59151a41c6 Mon Sep 17 00:00:00 2001 From: Sielski Date: Mon, 17 Jul 2017 11:58:03 +0200 Subject: [PATCH 1/4] Update stuff --- .travis.yml | 2 +- generate_yml.sh | 1 - infrastructure/Dockerfile | 16 ++++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28f788d..81d25ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: docker env: global: - - DOCKER_APP_VERSION=1.13.1-0~ubuntu-trusty + - DOCKER_APP_VERSION=17.05.0~ce-0~ubuntu-trusty notifications: slack: ebayclassifiedsgroup:tFHOcsnmbj9SKmfquoJJKjSb diff --git a/generate_yml.sh b/generate_yml.sh index 214d505..cf62ebd 100755 --- a/generate_yml.sh +++ b/generate_yml.sh @@ -170,7 +170,6 @@ MESOS_SLAVE_PARAMS="--master=zk://${ZOOKEEPER_HOSTS}/mesos \ --hostname=${FQDN} \ --ip=${LISTEN_IP} \ --docker_stop_timeout=5secs \ - --gc_delay=1days \ --docker_socket=/var/run/docker.sock \ --no-systemd_enable_support \ --work_dir=/tmp/mesos \ diff --git a/infrastructure/Dockerfile b/infrastructure/Dockerfile index 2c5d5aa..341a85b 100644 --- a/infrastructure/Dockerfile +++ b/infrastructure/Dockerfile @@ -42,16 +42,16 @@ RUN apt-get update \ ENV SUPERVISORD_APP_VERSION 3.2.3 ENV DOCKER_APP_VERSION 17.05.0~ce-0~ubuntu-xenial -ENV CONSUL_APP_VERSION 0.8.1 -ENV CONSUL_TEMPLATE_APP_VERSION 0.18.2 +ENV CONSUL_APP_VERSION 0.8.5 +ENV CONSUL_TEMPLATE_APP_VERSION 0.19.0 ENV HAPROXY_APP_VERSION 1.6.13-1ppa1~xenial -ENV MESOS_APP_VERSION 1.2.0-2.0.6 -ENV MARATHON_APP_VERSION 1.4.3-1.0.649.ubuntu1604 +ENV MESOS_APP_VERSION 1.3.0-2.0.3 +ENV MARATHON_APP_VERSION 1.4.5-1.0.654.ubuntu1604 ENV REGISTRATOR_APP_VERSION v7 -ENV CHRONOS_APP_VERSION 2.4.0-0.1.20151007110204.ubuntu1404 -ENV FABIO_APP_VERSION 1.4.3 -ENV FABIO_GO_APP_VERSION go1.8.1 -ENV NETDATA_APP_VERSION 1.6.0 +ENV CHRONOS_APP_VERSION 2.5.0-0.1.20170628182950.ubuntu1604 +ENV FABIO_APP_VERSION 1.5.1 +ENV FABIO_GO_APP_VERSION go1.8.3 +ENV NETDATA_APP_VERSION 1.7.0 ENV DOCKER_HOST unix:///tmp/docker.sock From 014572adf399ca9a4d9384097f17b2956e70b9b0 Mon Sep 17 00:00:00 2001 From: Sielski Date: Mon, 17 Jul 2017 12:11:58 +0200 Subject: [PATCH 2/4] Update stuff --- generate_yml.sh | 1 + infrastructure/Dockerfile | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/generate_yml.sh b/generate_yml.sh index cf62ebd..6642d3f 100755 --- a/generate_yml.sh +++ b/generate_yml.sh @@ -136,6 +136,7 @@ CONSUL_TEMPLATE_PARAMS="-consul=${CONSUL_IP}:8500 \ -template haproxy.cfg.ctmpl:/etc/haproxy/haproxy.cfg:/opt/consul-template/haproxy_reload.sh \ -consul-retry \ -max-stale=0 \ + -max_backoff=0 \ ${KEEPALIVED_CONSUL_TEMPLATE}" # DNSMASQ_PARAMS="-d \ diff --git a/infrastructure/Dockerfile b/infrastructure/Dockerfile index 341a85b..a0f4131 100644 --- a/infrastructure/Dockerfile +++ b/infrastructure/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update \ ENV SUPERVISORD_APP_VERSION 3.2.3 ENV DOCKER_APP_VERSION 17.05.0~ce-0~ubuntu-xenial ENV CONSUL_APP_VERSION 0.8.5 -ENV CONSUL_TEMPLATE_APP_VERSION 0.19.0 +ENV CONSUL_TEMPLATE_APP_VERSION 0.18.5 ENV HAPROXY_APP_VERSION 1.6.13-1ppa1~xenial ENV MESOS_APP_VERSION 1.3.0-2.0.3 ENV MARATHON_APP_VERSION 1.4.5-1.0.654.ubuntu1604 @@ -126,15 +126,11 @@ RUN echo "deb http://repos.mesosphere.io/ubuntu/ xenial main" > /etc/apt/sources && apt-get -y install \ mesos=${MESOS_APP_VERSION} \ marathon=${MARATHON_APP_VERSION} \ - && wget http://repos.mesosphere.io/ubuntu/pool/main/c/chronos/chronos_${CHRONOS_APP_VERSION}_amd64.deb \ - && dpkg -i chronos_${CHRONOS_APP_VERSION}_amd64.deb \ - && rm chronos_${CHRONOS_APP_VERSION}_amd64.deb \ + chronos=${CHRONOS_APP_VERSION} \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && rm /etc/mesos/zk ADD zkStart.sh /opt/zkStart.sh - # Chronos no longer in mesosphere ? - #chronos=${CHRONOS_APP_VERSION}\ ADD marathon.default /etc/default/marathon # MARATHON PLUGINS From acaa998535beab0069772542a8a1baa3357799bd Mon Sep 17 00:00:00 2001 From: Sielski Date: Mon, 17 Jul 2017 12:51:32 +0200 Subject: [PATCH 3/4] Update stuff --- generate_yml.sh | 1 - infrastructure/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/generate_yml.sh b/generate_yml.sh index 6642d3f..cf62ebd 100755 --- a/generate_yml.sh +++ b/generate_yml.sh @@ -136,7 +136,6 @@ CONSUL_TEMPLATE_PARAMS="-consul=${CONSUL_IP}:8500 \ -template haproxy.cfg.ctmpl:/etc/haproxy/haproxy.cfg:/opt/consul-template/haproxy_reload.sh \ -consul-retry \ -max-stale=0 \ - -max_backoff=0 \ ${KEEPALIVED_CONSUL_TEMPLATE}" # DNSMASQ_PARAMS="-d \ diff --git a/infrastructure/Dockerfile b/infrastructure/Dockerfile index a0f4131..3f46bb9 100644 --- a/infrastructure/Dockerfile +++ b/infrastructure/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update \ ENV SUPERVISORD_APP_VERSION 3.2.3 ENV DOCKER_APP_VERSION 17.05.0~ce-0~ubuntu-xenial ENV CONSUL_APP_VERSION 0.8.5 -ENV CONSUL_TEMPLATE_APP_VERSION 0.18.5 +ENV CONSUL_TEMPLATE_APP_VERSION 0.18.2 ENV HAPROXY_APP_VERSION 1.6.13-1ppa1~xenial ENV MESOS_APP_VERSION 1.3.0-2.0.3 ENV MARATHON_APP_VERSION 1.4.5-1.0.654.ubuntu1604 From 1550b91b4488163ed610973d6e4ee2a916bd5fc0 Mon Sep 17 00:00:00 2001 From: Sielski Date: Mon, 17 Jul 2017 13:04:15 +0200 Subject: [PATCH 4/4] Version bump up [ci skip] --- infrastructure/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/version b/infrastructure/version index 449d7e7..0f82685 100644 --- a/infrastructure/version +++ b/infrastructure/version @@ -1 +1 @@ -0.3.6 +0.3.7