Fix Dockerfile dependencies on all platforms

This commit is contained in:
Petros Angelatos 2015-11-02 23:33:32 +00:00 committed by Pablo Carranza Velez
parent 7deab91368
commit 5aa643aba4
4 changed files with 15 additions and 3 deletions

View File

@ -6,7 +6,8 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
RUN apt-get -q update \
&& apt-get install -qqy \
btrfs-tools \
docker.io \
ca-certificates \
curl \
jq \
rsync \
socat \
@ -15,6 +16,9 @@ RUN apt-get -q update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/
ENV DOCKER_VERSION 1.6.2
RUN curl -sL https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz | tar xzv --strip-components=3 -C /usr/bin
# Copy supervisord configuration files
COPY config/supervisor/ /etc/supervisor/

View File

@ -17,7 +17,8 @@ RUN apt-get -q update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/
RUN curl -sL https://github.com/resin-io/docker/releases/download/1.5.0-dev/docker-arm-1.5.0-dev.tar.xz | tar xJv --strip-components=1 -C /usr/bin
ENV DOCKER_VERSION 1.6.2
RUN curl -sL https://github.com/resin-io/docker/releases/download/${DOCKER_VERSION}/docker-arm-${DOCKER_VERSION}.tar.xz | tar xJv --strip-components=1 -C /usr/bin
# Copy supervisord configuration files
COPY config/supervisor/ /etc/supervisor/

View File

@ -6,15 +6,20 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
RUN apt-get -q update \
&& apt-get install -qqy \
btrfs-tools \
docker.io \
ca-certificates \
curl \
jq \
rsync \
socat \
supervisor \
xz-utils \
--no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/
ENV DOCKER_VERSION 1.6.2
RUN curl -sL https://github.com/resin-io/docker/releases/download/${DOCKER_VERSION}/docker-386-${DOCKER_VERSION}.tar.xz | tar xJv --strip-components=1 -C /usr/bin
# Copy supervisord configuration files
COPY config/supervisor/ /etc/supervisor/

View File

@ -6,6 +6,8 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
RUN apt-get -q update \
&& apt-get install -qqy \
btrfs-tools \
ca-certificates \
curl \
docker.io \
jq \
rsync \