From 93bf22a585a1d18cefce4372e8f75fe69914e700 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Fri, 8 Jul 2016 08:53:11 +0200 Subject: [PATCH 1/2] Fixing wrong WORKDIR syntax --- Dockerfile | 2 +- Dockerfile.stage1 | 2 +- Dockerfile.travis | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3780315..5c4bdc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,5 +40,5 @@ ENV LXC_GUEST_IP=10.0.3.5 ENV MIRROR_HOST=127.0.0.1 USER gitian -WORKDIR ["/gitian"] +WORKDIR /gitian ENTRYPOINT ["/gitian/make_gitian_vms.sh"] diff --git a/Dockerfile.stage1 b/Dockerfile.stage1 index bde612d..1bb6719 100644 --- a/Dockerfile.stage1 +++ b/Dockerfile.stage1 @@ -42,7 +42,7 @@ ENV LXC_GUEST_IP=10.0.3.5 ENV MIRROR_HOST=127.0.0.1 USER gitian -WORKDIR ["/gitian"] +WORKDIR /gitian ENTRYPOINT ["/gitian/make_gitian_vms.sh"] diff --git a/Dockerfile.travis b/Dockerfile.travis index 285e54e..ea6ed93 100644 --- a/Dockerfile.travis +++ b/Dockerfile.travis @@ -40,7 +40,7 @@ ENV LXC_GUEST_IP=10.0.3.5 ENV MIRROR_HOST=127.0.0.1 USER gitian -WORKDIR ["/gitian"] +WORKDIR /gitian ENTRYPOINT ["/gitian/make_gitian_vms.sh"] From 21d61ec5fdfd80fce1776c73e56104d4a65c7772 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Fri, 8 Jul 2016 09:45:17 +0200 Subject: [PATCH 2/2] "make depends" now needs `curl` --- Dockerfile | 2 +- Dockerfile.stage1 | 2 +- Dockerfile.travis | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c4bdc2..2d961a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:15.10 RUN apt-get update \ - && apt-get install -y python python-pip wget git apache2 ruby qemu-utils apt-cacher-ng lxc sudo debootstrap net-tools + && apt-get install -y python python-pip wget curl git apache2 ruby qemu-utils apt-cacher-ng lxc sudo debootstrap net-tools RUN mkdir /gitian \ && cd /gitian \ && wget http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12.4+bzr489.orig.tar.gz \ diff --git a/Dockerfile.stage1 b/Dockerfile.stage1 index 1bb6719..abf64cd 100644 --- a/Dockerfile.stage1 +++ b/Dockerfile.stage1 @@ -1,7 +1,7 @@ FROM ubuntu:15.10 RUN apt-get update \ - && apt-get install -y python python-pip wget git apache2 ruby qemu-utils apt-cacher-ng lxc sudo debootstrap net-tools + && apt-get install -y python python-pip wget curl git apache2 ruby qemu-utils apt-cacher-ng lxc sudo debootstrap net-tools RUN mkdir /gitian \ && cd /gitian \ && wget http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12.4+bzr489.orig.tar.gz \ diff --git a/Dockerfile.travis b/Dockerfile.travis index ea6ed93..dd008e9 100644 --- a/Dockerfile.travis +++ b/Dockerfile.travis @@ -2,7 +2,7 @@ FROM ubuntu:15.10 RUN apt-get update \ - && apt-get install -y python python-pip wget git apache2 ruby qemu-utils apt-cacher-ng lxc sudo debootstrap net-tools + && apt-get install -y python python-pip wget curl git apache2 ruby qemu-utils apt-cacher-ng lxc sudo debootstrap net-tools RUN mkdir /gitian \ && cd /gitian \ && wget http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12.4+bzr489.orig.tar.gz \