From a07ff806629bdc405b2a0f9b5aa7a68e8771df35 Mon Sep 17 00:00:00 2001 From: Ramon Buckland Date: Tue, 2 May 2017 21:22:14 +1000 Subject: [PATCH] use bsdtar because: https://github.com/coreos/bugs/issues/1095 --- docker.diskimage-builder/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker.diskimage-builder/Dockerfile b/docker.diskimage-builder/Dockerfile index 1287edc30..90f9e6289 100644 --- a/docker.diskimage-builder/Dockerfile +++ b/docker.diskimage-builder/Dockerfile @@ -3,8 +3,7 @@ FROM ubuntu:16.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update \ - && apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bsdtar \ - && mv /bin/tar /bin/tar.notused && ln -s /bin/bsdtar /bin/tar + && apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bsdtar # RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D @@ -30,3 +29,4 @@ RUN cd /usr/local/src/diskimage-builder \ && python setup.py build \ && python setup.py install \ && git clone https://github.com/openstack/dib-utils /usr/local/src/dib-utils +RUN mv /bin/tar /bin/tar.notused && ln -s /bin/bsdtar /bin/tar