fixing version # on GSA login screen and minor updates from GB

Dockerfile

@@ -15,6 +15,7 @@ RUN mkdir /build.d
 COPY build.rc /
 COPY package-list-build /
 COPY build.d/build-prereqs.sh /build.d/
+COPY ver.current /
 RUN bash /build.d/build-prereqs.sh
 COPY build.d/update-certs.sh /build.d/
 RUN bash /build.d/update-certs.sh
@@ -112,6 +113,7 @@ COPY globals.sql.xz /usr/lib/globals.sql.xz
 COPY gvmd.sql.xz /usr/lib/gvmd.sql.xz
 COPY var-lib.tar.xz /usr/lib/var-lib.tar.xz
 COPY scripts/* /scripts/
+
 # Healthcheck needs be an on image script that will know what service is running and check it. 
 # Current image function stored in /usr/local/etc/running-as
 HEALTHCHECK --interval=300s --start-period=300s --timeout=120s \

Readme.md

@@ -1,63 +0,0 @@
-[![Docker Pulls](https://img.shields.io/docker/pulls/immauss/openvas.svg)](https://hub.docker.com/r/immauss/openvas/)
-[![Docker Stars](https://img.shields.io/docker/stars/immauss/openvas?style=flat)](https://hub.docker.com/r/immauss/openvas/)
-[![Docker Stars](https://img.shields.io/docker/image-size/immauss/openvas.svg?maxAge=2592000)](https://hub.docker.com/r/immauss/openvas/)
-[![GitHub Issues](https://img.shields.io/github/issues-raw/immauss/openvas.svg)](https://github.com/immauss/openvas/issues)
-[![Discord](https://img.shields.io/discord/809911669634498596?label=Discord&logo=discord)](https://discord.gg/DtGpGFf7zV)
-[![Twitter Badge](https://badgen.net/badge/icon/twitter?icon=twitter&label)](https://twitter.com/immauss)
-![GitHub Repo stars](https://img.shields.io/github/stars/immauss/openvas?style=social)
-
-# A Greenbone Vulnerability Management docker image
-### Brought to you by ###
-[![Immauss Cybersecurity](https://github.com/immauss/openvas/raw/master/images/ics-hz.png)](https://www.immauss.com "Immauss Cybersecurity")
-
-[Sponsor immauss on GitHub](https://github.com/sponsors/immauss)
-OR
-[Sponsor by PayPal](https:/www.immauss.com/container_subscriptions)
-
-# A big THANK YOU to Absolute Ops, our newest Platinum Sponsor
-
-[![AbsoluteOps](https://raw.githubusercontent.com/immauss/openvas/master/images/absolute-ops.png)](https://www.absoluteops.com/ "AbsoluteOps") 
-
-## Current Silver Sponsors ##
-[![NOS Informatica](https://raw.githubusercontent.com/immauss/openvas/master/images/NOSinformatica.png)](https://nosinformatica.com/ "NOS Informatica")
-- - - -
-## Documentation ##
-The current container docs are maintained on github [here](https://immauss.github.io/openvas/)
-
-For docs on the web interface and scanning, use Greenbone's docs [here](https://docs.greenbone.net/GSM-Manual/gos-22.04/en/). Chapter's 8-14 cover the bits you'll need.
-- - - -
-
-# Docker Tags  #
-tag              | Description
-----------------|-------------------------------------------------------------------
-24.12.03 | This is the latest based on GVMd 24 available on x86_64 and arm64.
-21.04.09 | This is the last 21.4 build.  
-20.08.04.6 | The last 20.08 image
-pre-20.08   | This is the last image from before the 20.08 update. 
-v1.0             | old out of date image for posterity. (Dont` use this one. . . . ever)
-
-# Greenbone Versions in Latest image: #
-Component | Version | | Component | Version
-----------|----------|-|----------|---------
-| gvmd | v24.1.2 | | gvm_libs | v22.15.0 |
-| openvas | v23.14.0 | | openvas_smb | v22.5.6 |
-| notus_scanner | v22.6.5 | | gsa | v24.1.0 |
-| gsad | v24.1.0 | | ospd | v21.4.4 |
-| ospd_openvas | v22.7.1 | | pg_gvm | v22.6.6 |
-| python_gvm | v24.12.0 | | gvm_tools | v24.12.1 |
-| greenbone_feed_sync | v24.9.0 |
-
-# 25 August 2023 #
-## Discussions!!! ##
-
-Moving forward, all new versions and any other changes will be posted in the [Announcements](https://github.com/immauss/openvas/discussions). The contents of this Readme will be preserved as [OldReadme.md](https://github.com/immauss/openvas/OldReadme.md). 
-
-Thanks,
-Scott
-
-- - - -
-
-
-
-
-For License info, see the [GNU Affero](https://github.com/immauss/openvas/blob/master/LICENSE) license.

bin/base-rebuild.sh

@@ -52,6 +52,9 @@ while ! [ -z "$1" ]; do
 	--push)
 	shift
 	PUBLISH="--push"
+	GSABUILD=true
+	NOBASE=true
+	echo "Publishing to docker hub. Forcing GSA Build and NOBASE."
 	;;
 	--load)
 	shift
@@ -153,6 +156,7 @@ if ! [ -f tmp/build/$gsa.tar.gz ] || [ "x$GSABUILD" == "xtrue" ] ; then
 			-v $(pwd)/tmp/build:/build \
 			-v $(pwd):/build.d \
 			-v $(pwd)/gsa-final:/final \
+			-v $(pwd)/ver.current:/ver.current \
 			immauss/ovasbase -c "cd /build.d; bash build.d/gsa-main.sh $tag"
 else
 	echo "Looks like we have already built gsa $gsa"

build.d/gsa-main.sh

@@ -20,7 +20,15 @@ apt update && apt install patch -y
 echo "BUILDDIR $BUILDDIR"
 patch -p1 < /ics-gsa/ics-gsa.patch
 #/ics-gsa/scripts/gsa-mods.sh $BUILDDIR $tag
-sed -i s/XXXXXXX/$tag/ "$BUILDDIR/src/web/pages/login/loginform.jsx"
+if ! [ -f /ver.current ]; then
+    echo "Where is /ver.curent?" 
+    exit 1
+else 
+    CVersion=$(cat /ver.current)
+    echo "Current Container version is $CVersion . "
+fi
+CVersion=$(cat /ver.current)
+sed -i s/XXXXXXX/$CVersion/ "$BUILDDIR/src/web/pages/login/loginform.jsx"
 
 apt update && apt install npm -y 
 #update npm and the browserlist

update.ts

@@ -1 +1 @@
-Mon Jan 13 02:33:34 AM UTC 2025
+Sun Jan 19 02:34:12 AM UTC 2025