CloudAWIPS 18.1.1-1

Unidata · Sep 14, 2018 · 90e39d1 · 90e39d1
1 parent 3203fd9
commit 90e39d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -38,7 +38,7 @@ ENV README_FILE README.md
 # Add the version number to the version file
 ###
 
-RUN echo "CloudAWIPS Version: $(cat /awips2/cave/awipsVersion.txt | grep vizVersion| cut -d "=" -f 2) $(date)" >> $VERSION_FILE
+RUN echo "CloudAWIPS Version: $(rpm -qa |grep awips2-cave-wrapper | cut -d "-" -f 4,5) $(date)" >> $VERSION_FILE
 
 ###
 # Environmental variable control
@@ -53,9 +53,8 @@ RUN chown -R ${CUSER}:${CUSER} ${HOME}
 # Manual cleanup
 ###
 
-RUN rm -rf /awips2/cave/plugins/com.raytheon.uf.viz.archive_1.16.0.2018041718.jar
-RUN rm -rf /awips2/cave/plugins/com.raytheon.uf.viz.stats_1.15.0.2018041718.jar
-RUN rm -rf /awips2/cave/plugins/com.raytheon.uf.viz.useradmin_1.14.0.2018041718.jar
+RUN rm -rf /awips2/cave/plugins/com.raytheon.uf.viz.archive*.jar
+RUN rm -rf /awips2/cave/plugins/com.raytheon.uf.viz.useradmin*.jar
 
 USER ${CUSER}
 
@@ -68,7 +67,7 @@ ENV CDEPTH 24
 
 # Fluxbox desktop environment
 RUN echo "session.screen0.toolbar.visible: false" >> ~/.fluxbox/init
-RUN echo "session.screen0.defaultDeco: NONE" >> ~/.fluxbox/init
+#RUN echo "session.screen0.defaultDeco: NONE" >> ~/.fluxbox/init
 RUN echo "/usr/bin/fluxbox -log ~/.fluxbox/log" > ~/.fluxbox/startup
 # Fluxbox menu
 RUN echo "[begin] (fluxbox)" > ~/.fluxbox/menu

diff --git a/Makefile b/Makefile
@@ -1,18 +1,19 @@
 ORG = unidata
 IMAGE = cloudawips
+TAG = latest
 
 all: build push
 
 build:
-	docker build \
-		-t $(ORG)/$(IMAGE) \
+	docker build  \
+		-t $(ORG)/$(IMAGE):$(TAG) \
 		-f Dockerfile \
-		--build-arg IMAGE=$(ORG)/$(IMAGE) \
+		--build-arg IMAGE=$(ORG)/$(IMAGE):$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		.
 push:
-	docker push $(ORG)/$(IMAGE)
+	docker push $(ORG)/$(IMAGE):$(TAG)
 
 .PHONY: build push
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -110,9 +110,9 @@ openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem -batch >&
 cd ~
 /home/${CUSER}/noVNC/utils/launch.sh ${SSLOP} --vnc 127.0.0.1:5901 >& /dev/null &
 
-printf "\n\n=============================================================\n"
+printf "\n\n=====================================================================\n"
 cat VERSION.md
-printf "=============================================================\n\n"
+printf "=====================================================================\n\n"
 
 if [ -f /home/${CUSER}/start.sh ]; then
     /home/${CUSER}/start.sh >& /dev/null