From e651e47a9f147b023567fe8a98fd638e481f9872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 2 May 2021 13:35:44 +0200
Subject: RPM: update build scripts for opensuse TW

---
 redhat/docker/osstw/Dockerfile.x86_64 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'redhat/docker/osstw/Dockerfile.x86_64')

diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 34b3b6d9f..e69c02087 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -4,9 +4,10 @@ ARG TDE_VERSION=14.0.10
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
-RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
-ADD packages /packages
-RUN zypper refresh \
+COPY packages /packages
+RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
+ && zypper -n refresh \
+ && zypper -n install busybox perl shadow \
  && zypper -n dup \
  && zypper -n update \
  && zypper -n install $(</packages)
@@ -16,7 +17,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Add YUM repository for locally built packages
 RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
-- 
cgit v1.2.3