Bumped to version 2.0.6

Geontech · Jul 19, 2017 · 88f1989 · 88f1989
1 parent 27e183c
commit 88f1989
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 26 deletions.
diff --git a/Dockerfiles/base.Dockerfile b/Dockerfiles/base.Dockerfile
@@ -19,7 +19,7 @@
 
 FROM centos:7
 
-ENV RH_VERSION=2.0.5
+ENV RH_VERSION=2.0.6
 ENV OMNISERVICEIP 127.0.0.1
 
 LABEL name="REDHAWK SDR Base Image" \
@@ -34,7 +34,8 @@ ADD files/geon-redhawk.repo /etc/yum.repos.d/geon-redhawk.repo
 
 # Update, epel, etc. as well as upgraded pyparsing
 # Then add setup supervisord directories
-RUN yum install -y \
+RUN sed -i "s/RH_VERSION/${RH_VERSION}/g" /etc/yum.repos.d/geon-redhawk.repo && \
+    yum install -y \
     curl \
     wget \
     epel-release \

diff --git a/Dockerfiles/bu353s4.Dockerfile b/Dockerfiles/bu353s4.Dockerfile
@@ -17,10 +17,9 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime:2.0.5
+FROM geontech/redhawk-runtime:2.0.6
 LABEL name="Geon Technology's BU353S4 GPS Device" \
-    description="Geon's BU353S4" \
-    maintainer="Thomas Goodwin <btgoodwin@geontech.com>"
+    description="Geon's BU353S4"
 
 # Yum necessities, download nmealib and bu353s4, compile each, remove unused things
 RUN yum install -y \

diff --git a/Dockerfiles/development.Dockerfile b/Dockerfiles/development.Dockerfile
@@ -17,10 +17,9 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime:2.0.5
+FROM geontech/redhawk-runtime:2.0.6
 LABEL name="REDHAWK IDE Environment" \
-	description="REDHAWK Integrated Development Environment Runner" \
-	maintainer="Thomas Goodwin <btgoodwin@geontech.com>"
+	description="REDHAWK Integrated Development Environment Runner"
 
 # Install development environment
 RUN yum groupinstall -y "REDHAWK Development" && \

diff --git a/Dockerfiles/domain.Dockerfile b/Dockerfiles/domain.Dockerfile
@@ -17,7 +17,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime:2.0.5
+FROM geontech/redhawk-runtime:2.0.6
 LABEL name="REDHAWK SDR Domain" \
     description="REDHAWK SDR Domain Runner"
 

diff --git a/Dockerfiles/files/geon-redhawk.repo b/Dockerfiles/files/geon-redhawk.repo
@@ -1,5 +1,5 @@
 [redhawk]
 name=REDHAWK Repository
-baseurl=http://www.geontech.com/repositories/redhawk/yum/2.0.5/el7/x86_64
+baseurl=http://www.geontech.com/repositories/redhawk/yum/RH_VERSION/el7/x86_64
 enabled=1
 gpgcheck=0
diff --git a/Dockerfiles/gpp.Dockerfile b/Dockerfiles/gpp.Dockerfile
@@ -17,10 +17,9 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime:2.0.5
-LABEL version="2.0.5" \
-    description="REDHAWK GPP Runner" \
-    maintainer="Thomas Goodwin <btgoodwin@geontech.com>"
+FROM geontech/redhawk-runtime:2.0.6
+LABEL name="REDHAWK GPP Device" \
+    description="REDHAWK GPP Runner"
 
 ENV DOMAINNAME ""
 ENV NODENAME   ""

diff --git a/Dockerfiles/omniserver.Dockerfile b/Dockerfiles/omniserver.Dockerfile
@@ -17,7 +17,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-base:2.0.5
+FROM geontech/redhawk-base:2.0.6
 
 LABEL name="OmniORB Servers" \
     description="Omni* Services Runner"

diff --git a/Dockerfiles/rtl2832u.Dockerfile b/Dockerfiles/rtl2832u.Dockerfile
@@ -17,10 +17,9 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime:2.0.5
+FROM geontech/redhawk-runtime:2.0.6
 LABEL name="REDHAWK SDR RTL2832U Device" \
-    description="REDHAWK RTL2832U" \
-    maintainer="Thomas Goodwin <btgoodwin@geontech.com>"
+    description="REDHAWK RTL2832U"
 
 RUN yum install -y \
 		redhawk-sdrroot-dev-mgr \
@@ -35,7 +34,7 @@ RUN yum install -y \
     source /etc/profile.d/redhawk-sdrroot.sh && \
     git clone git://github.com/RedhawkSDR/RTL2832U.git && \
     pushd RTL2832U && \
-    git checkout tags/2.0.1 && \
+    git checkout tags/2.0.1-5 && \
     ./build.sh && \
     ./build.sh install && \
     popd && \

diff --git a/Dockerfiles/runtime.Dockerfile b/Dockerfiles/runtime.Dockerfile
@@ -17,7 +17,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-base:2.0.5
+FROM geontech/redhawk-base:2.0.6
 LABEL name="REDHAWK SDR Runtime" \
     description="REDHAWK SDR Runtime dependencies"
 

diff --git a/Dockerfiles/usrp.Dockerfile b/Dockerfiles/usrp.Dockerfile
@@ -17,10 +17,9 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime:2.0.5
+FROM geontech/redhawk-runtime:2.0.6
 LABEL name="REDHAWK SDR USRP_UHD Device" \
-    description="REDHAWK USRP_UHD w/ updated UHD driver version (3.10)" \
-    maintainer="Thomas Goodwin <btgoodwin@geontech.com>"
+    description="REDHAWK USRP_UHD w/ updated UHD driver version (3.10)"
 
 # Compile UHD from source
 RUN yum install -y \
@@ -86,7 +85,7 @@ RUN yum install -y \
     source /etc/profile.d/redhawk-sdrroot.sh && \
     git clone git://github.com/RedhawkSDR/USRP_UHD.git && \
     pushd USRP_UHD && \
-    git checkout tags/4.0.1 && \
+    git checkout tags/5.0.0 && \
     ./build.sh && \
     ./build.sh install && \
     popd && \

diff --git a/Dockerfiles/webserver.Dockerfile b/Dockerfiles/webserver.Dockerfile
@@ -17,7 +17,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-FROM geontech/redhawk-runtime
+FROM geontech/redhawk-runtime:2.0.6
 LABEL name="REST-Python Web Server" \
     description="Geon's Fork of REST-Python" \
     maintainer="Thomas Goodwin <btgoodwin@geontech.com>"

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 #
 
-VERSION := 2.0.5
+VERSION := 2.0.6
 
 image_prefix := geontech/redhawk
 base := $(image_prefix)-base