From f9f7debe71086f0b018d4dbfb4604631405d5e72 Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Mon, 20 Jun 2016 22:18:26 -0300 Subject: [PATCH] Add docker-compose 1.7.1 on all debian builds --- Dockerfile.amd64 | 14 ++++++++++---- Dockerfile.armel | 11 +++++++++++ Dockerfile.armv7hf | 5 ++--- Dockerfile.i386 | 11 +++++++++++ Dockerfile.rpi | 11 +++++++++++ 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index d29691a5..49d7fb4f 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -2,6 +2,9 @@ FROM resin/amd64-node:0.10.40-slim COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/ +ENV DOCKER_COMPOSE_VERSION 1.7.1 +ENV DOCKER_COMPOSE_SHA256 37df85ee18bf0e2a8d71cbfb8198b1c06cc388f19118be7bdfc4d6db112af834 + # Supervisor apt dependencies RUN apt-get -q update \ && apt-get install -qqy \ @@ -11,13 +14,16 @@ RUN apt-get -q update \ rsync \ supervisor \ --no-install-recommends \ + && curl -sLO http://resin-packages.s3.amazonaws.com/docker-compose/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && echo $DOCKER_COMPOSE_SHA256 docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}.tar.gz > docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && sha256sum -c docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && tar xzf docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && mv docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}/docker-compose-linux-amd64 /usr/bin/docker-compose \ + && rm -rf docker-compose-linux-amd64-${DOCKER_COMPOSE_VERSION}* \ + && apt-get purge -qqy curl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ -ENV DOCKER_COMPOSE_VERSION 1.8.0dev -ENV DOCKER_COMPOSE_SHA256 9db33b03d9d02ea03aef7806f0272205a7c59b1a66599d559922db0eafaeb271 - - # Copy supervisord configuration files COPY config/supervisor/ /etc/supervisor/ diff --git a/Dockerfile.armel b/Dockerfile.armel index 894a69c1..0d69a396 100644 --- a/Dockerfile.armel +++ b/Dockerfile.armel @@ -2,14 +2,25 @@ FROM resin/armel-node:0.10.40-slim COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/ +ENV DOCKER_COMPOSE_VERSION 1.7.1 +ENV DOCKER_COMPOSE_SHA256 a1025fed97536e2698798ea277a014ec5e1eae816a8cf3155ecbe9679e3e7bac + # Supervisor apt dependencies RUN apt-get -q update \ && apt-get install -qqy \ btrfs-tools \ ca-certificates \ + curl \ rsync \ supervisor \ --no-install-recommends \ + && curl -sLO http://resin-packages.s3.amazonaws.com/docker-compose/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && echo $DOCKER_COMPOSE_SHA256 docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}.tar.gz > docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && sha256sum -c docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && tar xzf docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && mv docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}/docker-compose-linux-armel /usr/bin/docker-compose \ + && rm -rf docker-compose-linux-armel-${DOCKER_COMPOSE_VERSION}* \ + && apt-get purge -qqy curl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ diff --git a/Dockerfile.armv7hf b/Dockerfile.armv7hf index 44cb1808..eefef8a0 100644 --- a/Dockerfile.armv7hf +++ b/Dockerfile.armv7hf @@ -2,8 +2,8 @@ FROM resin/armv7hf-node:0.10.40-slim COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/ -ENV DOCKER_COMPOSE_VERSION 1.8.0dev -ENV DOCKER_COMPOSE_SHA256 0f9e0bdedddc9188415e828985289d07e22e42244c758bd0e4579e7a5bfb881d +ENV DOCKER_COMPOSE_VERSION 1.7.1 +ENV DOCKER_COMPOSE_SHA256 3f0b8c69c66a2daa5fbb0c127cb76ca95d7125827a9c43dd3c36f9bc2ed6e0e5 # Supervisor apt dependencies RUN apt-get -q update \ @@ -24,7 +24,6 @@ RUN apt-get -q update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ - # Copy supervisord configuration files COPY config/supervisor/ /etc/supervisor/ diff --git a/Dockerfile.i386 b/Dockerfile.i386 index 13aa2a57..3e6ec066 100644 --- a/Dockerfile.i386 +++ b/Dockerfile.i386 @@ -2,14 +2,25 @@ FROM resin/i386-node:0.10.40-slim COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/ +ENV DOCKER_COMPOSE_VERSION 1.7.1 +ENV DOCKER_COMPOSE_SHA256 b926fd9a2a9d89358f1353867706f94558a62caaf3aa72bf10bcbbe31e1a44f0 + # Supervisor apt dependencies RUN apt-get -q update \ && apt-get install -qqy \ btrfs-tools \ ca-certificates \ + curl \ rsync \ supervisor \ --no-install-recommends \ + && curl -sLO http://resin-packages.s3.amazonaws.com/docker-compose/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && echo $DOCKER_COMPOSE_SHA256 docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}.tar.gz > docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && sha256sum -c docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && tar xzf docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && mv docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}/docker-compose-linux-i386 /usr/bin/docker-compose \ + && rm -rf docker-compose-linux-i386-${DOCKER_COMPOSE_VERSION}* \ + && apt-get purge -qqy curl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ diff --git a/Dockerfile.rpi b/Dockerfile.rpi index a828473d..b60a0ba3 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -2,14 +2,25 @@ FROM resin/rpi-node:0.10.40-slim COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/ +ENV DOCKER_COMPOSE_VERSION 1.7.1 +ENV DOCKER_COMPOSE_SHA256 3f0b8c69c66a2daa5fbb0c127cb76ca95d7125827a9c43dd3c36f9bc2ed6e0e5 + # Supervisor apt dependencies RUN apt-get -q update \ && apt-get install -qqy \ btrfs-tools \ ca-certificates \ + curl \ rsync \ supervisor \ --no-install-recommends \ + && curl -sLO http://resin-packages.s3.amazonaws.com/docker-compose/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && echo $DOCKER_COMPOSE_SHA256 docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}.tar.gz > docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && sha256sum -c docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}.tar.gz.sha256 \ + && tar xzf docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}.tar.gz \ + && mv docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}/docker-compose-linux-armhf /usr/bin/docker-compose \ + && rm -rf docker-compose-linux-armhf-${DOCKER_COMPOSE_VERSION}* \ + && apt-get purge -qqy curl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/