GITC-991 Tweaks to the Docker build scripts

nasa-gibs · Mar 8, 2019 · 4bb6508 · 4bb6508
1 parent bce574b
commit 4bb6508
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/build_el7_docker_image.sh b/bin/build_el7_docker_image.sh
@@ -11,7 +11,8 @@ TAG="$1"
 
 mkdir -p docker/el7/rpms
 cp dist/gibs-gdal-*.el7.*.rpm docker/el7/rpms/
-rm -f docker/el7/rpms/gibs-gdal-*.el7.*.src.rpm
+rm -f docker/el7/rpms/gibs-gdal-*.src.rpm
+rm -f docker/el7/rpms/gibs-gdal-debuginfo-*.rpm
 
 (
   set -e

diff --git a/bin/build_el7_rpms_in_docker.sh b/bin/build_el7_rpms_in_docker.sh
@@ -17,6 +17,7 @@ yum install -y \
   wget \
   rpmdevtools \
   mock \
+  rsync \
   python-pip
 
 mkdir -p /build
@@ -31,7 +32,6 @@ chown -R root:root /build
 )
 
 cp /build/dist/gibs-gdal-*.rpm /dist/
-chown "${DOCKER_UID}:${DOCKER_GID}" /dist/gibs-gdal-*.rpm
 EOS
 chmod +x dist/build_rpms.sh
 

diff --git a/deploy/gibs-gdal/gibs-gdal.spec b/deploy/gibs-gdal/gibs-gdal.spec
@@ -30,7 +30,6 @@ BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:  geos-devel >= 3.3.2
 Requires:	gcc-c++
-Requires:	python-devel
 Requires:	geos >= 3.3.2
 
 %description