From 6918a98af1bba1e7c476f2035d5d0c66caf7efdb Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 12 Feb 2015 11:21:00 +0100 Subject: [PATCH] tests: Dockerfile COPY with two arguments Avoid using COPY with multiple files because it will not behave as intended with older (1.2) versions of docker. Signed-off-by: Loic Dachary --- src/test/centos-7/Dockerfile.in | 5 +++-- src/test/ubuntu-12.04/Dockerfile.in | 2 +- src/test/ubuntu-14.04/Dockerfile.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/centos-7/Dockerfile.in b/src/test/centos-7/Dockerfile.in index 3f07b8189ed5..dfde99ae5141 100644 --- a/src/test/centos-7/Dockerfile.in +++ b/src/test/centos-7/Dockerfile.in @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 Red Hat +# Copyright (C) 2014, 2015 Red Hat # # Author: Loic Dachary # @@ -20,7 +20,8 @@ # FROM centos:%%os_version%% -COPY install-deps.sh ceph.spec.in /root/ +COPY install-deps.sh /root/ +COPY ceph.spec.in /root/ # http://jperrin.github.io/centos/2014/09/25/centos-docker-and-systemd/ RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs && (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done) && rm -f /lib/systemd/system/multi-user.target.wants/* && rm -f /etc/systemd/system/*.wants/* && rm -f /lib/systemd/system/local-fs.target.wants/* && rm -f /lib/systemd/system/sockets.target.wants/*udev* && rm -f /lib/systemd/system/sockets.target.wants/*initctl* && rm -f /lib/systemd/system/basic.target.wants/* && rm -f /lib/systemd/system/anaconda.target.wants/* && yum install -y redhat-lsb-core RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/7/x86_64/ && yum install --nogpgcheck -y epel-release && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && rm /etc/yum.repos.d/dl.fedoraproject.org* diff --git a/src/test/ubuntu-12.04/Dockerfile.in b/src/test/ubuntu-12.04/Dockerfile.in index 3cf842ebee8e..fddf929324dc 100644 --- a/src/test/ubuntu-12.04/Dockerfile.in +++ b/src/test/ubuntu-12.04/Dockerfile.in @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 Red Hat +# Copyright (C) 2014, 2015 Red Hat # # Author: Loic Dachary # diff --git a/src/test/ubuntu-14.04/Dockerfile.in b/src/test/ubuntu-14.04/Dockerfile.in index 3cf842ebee8e..fddf929324dc 100644 --- a/src/test/ubuntu-14.04/Dockerfile.in +++ b/src/test/ubuntu-14.04/Dockerfile.in @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 Red Hat +# Copyright (C) 2014, 2015 Red Hat # # Author: Loic Dachary # -- 2.47.3