build updates for 7.4.3

Unidata · Sep 11, 2018 · fd0adc2 · fd0adc2
1 parent 9e74ab8
commit fd0adc2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/build/build_rhel.sh b/build/build_rhel.sh
@@ -1,7 +1,4 @@
 #!/bin/sh -xe
-OS_TYPE=$1
-OS_VERSION=$2
-
 # Prepare the RPM environment
 mkdir -p /tmp/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 pushd /gempak

diff --git a/build/gempak-devel/Dockerfile.centos6 b/build/gempak-devel/Dockerfile.centos6
@@ -26,4 +26,4 @@ RUN yum install -y \
   python-devel
 
 # Bootstrap install extlibs...
-RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-latest.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.4.3-1.el6.x86_64.rpm
diff --git a/build/gempak-devel/Dockerfile.fedora b/build/gempak-devel/Dockerfile.fedora
@@ -26,4 +26,4 @@ RUN yum install -y \
   python-devel
 
 # Bootstrap install extlibs...
-RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-latest.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.4.3.fc26.x86_64.rpm
diff --git a/build/setup.sh b/build/setup.sh
@@ -19,7 +19,7 @@ elif [ "$os_type" = "centos" ]; then
 
     if [ "$os_version" = "container" ]; then
 
-        sudo docker build -t unidata/gempak-devel -f build/docker/Dockerfile.gempak build/docker
+        sudo docker build -t unidata/gempak-devel:centos6 -f build/docker/Dockerfile.gempak build/docker
 
     elif [ "$os_version" = "6" ]; then
 
@@ -39,7 +39,7 @@ elif [ "$os_type" = "centos" ]; then
 
 elif [ "$os_type" = "ubuntu" ]; then
 
-    sudo docker run --rm=true -v `pwd`:/gempak:rw unidata/gempak-devel:ubuntu /bin/bash -c "bash -xe /gempak/build/build_ubuntu.sh "
+    sudo docker run --rm=true -v `pwd`:/gempak:rw ubuntu:latest /bin/bash -c "bash -xe /gempak/build/build_ubuntu.sh "
 
 elif [ "$os_type" = "fedora" ]; then