diff --git a/CHANGELOG.md b/CHANGELOG.md index aa6df40..85c392e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -## cockpit-45drives-hardware 2.0.0-4 +## cockpit-45drives-hardware 2.0.0-5 -* build 3, added require el7 folder \ No newline at end of file +* updated images used in 45drives-system page \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2a9b018..7385ba0 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "title": "cockpit-45drives-hardware", "prerelease": true, "version": "2.0.0", - "buildVersion": "4", + "buildVersion": "5", "author": "Mark Hooper ", "url": "https://github.com/45Drives/cockpit-hardware", "category": "utils", @@ -63,7 +63,7 @@ "changelog": { "urgency": "medium", "version": "2.0.0", - "buildVersion": "4", + "buildVersion": "5", "ignore": [], "date": null, "packager": "Mark Hooper ", diff --git a/package-deb.sh b/package-deb.sh deleted file mode 100755 index 6dacd0c..0000000 --- a/package-deb.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# fill this in with a name unique to the software package -PACKAGE_NAME=cockpit-45drives-hardware - -# check that docker is installed -command -v docker > /dev/null 2>&1 || { - echo "Please install docker."; - exit 1; -} - -# if docker image DNE, build it (keep container tag name unique to software package) -if [[ "$(docker images -q $PACKAGE_NAME-ubuntu-builder 2> /dev/null)" == "" ]]; then - docker build -t $PACKAGE_NAME-ubuntu-builder - < docker/ubuntu # pass in path to docker file - res=$? - if [ $res -ne 0 ]; then - echo "Building docker image failed." - exit $res - fi -fi - -make clean - -mkdir -p dist/ubuntu - -# mirror current directory to working directory in container, and mirror dist/ubuntu to .. for deb output -docker run -u $(id -u):$(id -g) -w /home/deb/build -it -v$(pwd):/home/deb/build -v$(pwd)/dist/ubuntu:/home/deb --rm $PACKAGE_NAME-ubuntu-builder dpkg-buildpackage -us -uc -b -res=$? -if [ $res -ne 0 ]; then - echo "Packaging failed." - exit $res -fi - -rmdir dist/ubuntu/build - -echo "deb is in dist/ubuntu/" - -exit 0 diff --git a/package-rpm-el7.sh b/package-rpm-el7.sh deleted file mode 100755 index 55a123a..0000000 --- a/package-rpm-el7.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -PACKAGE_NAME=cockpit-45drives-hardware - -# check if docker is installed -command -v docker > /dev/null 2>&1 || { - echo "Please install docker."; - exit 1; -} - -# if docker image DNE, build it -if [[ "$(docker images -q $PACKAGE_NAME-el7-builder 2> /dev/null)" == "" ]]; then - docker build -t $PACKAGE_NAME-el7-builder - < docker/centos7 # pass path to dockerfile - res=$? - if [ $res -ne 0 ]; then - echo "Building docker image failed." - exit $res - fi -fi - -mkdir -p dist/{el7,tmp} - -# get the source name - from spec fie -SOURCE_DIR=$PACKAGE_NAME-$(grep Version rpm/$PACKAGE_NAME.spec --color=never | awk '{print $2}') -DEST=dist/tmp/$SOURCE_DIR -mkdir -p $DEST - -# Build source (uncomment following lines if building is needed, not needed for scripts like 45drives-tools) -# docker run -u $(id -u):$(id -g) -w /home/rpm/build -it -v$(pwd):/home/rpm/build --rm $PACKAGE_NAME-el7-builder make -j8 -# res=$? -# if [ $res -ne 0 ]; then -# echo "Building failed." -# exit $res -# fi - -# For scripts that do not need any building, just running make install from the host is fine: -make DESTDIR=$DEST PACKAGING=1 install -# directory tree from / of filesystem should now be in dist/tmp/-/ - -# tarball the installed files -pushd $DEST/.. -tar -czvf $SOURCE_DIR.tar.gz $SOURCE_DIR -popd - -# build rpm from source tar and place it dist/el7 by mirroring dist/el7 to rpmbuild/RPMS -docker run -u $(id -u):$(id -g) -w /home/rpm/rpmbuild -it -v$(pwd)/dist/tmp:/home/rpm/rpmbuild/SOURCES -v$(pwd)/dist/el7:/home/rpm/rpmbuild/RPMS -v$(pwd)/rpm:/home/rpm/rpmbuild/SPECS --rm $PACKAGE_NAME-el7-builder rpmbuild -ba SPECS/$PACKAGE_NAME.spec -res=$? -if [ $res -ne 0 ]; then - echo "Packaging failed." - exit $res -fi - -rm -rf dist/tmp - -echo "rpm is in dist/el7/" - -exit 0 \ No newline at end of file diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec index 5e76e1a..591f4b9 100644 --- a/packaging/el7/main.spec +++ b/packaging/el7/main.spec @@ -40,6 +40,8 @@ make DESTDIR=%{buildroot} install /usr/share/cockpit/45drives-system/* %changelog +* Mon Aug 23 2021 Mark Hooper 2.0.0-5 +- updated images used in 45drives-system page * Fri Aug 20 2021 Mark Hooper 2.0.0-4 - build 3, added require el7 folder * Fri Aug 20 2021 Mark Hooper 2.0.0-3 diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index 5e76e1a..591f4b9 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -40,6 +40,8 @@ make DESTDIR=%{buildroot} install /usr/share/cockpit/45drives-system/* %changelog +* Mon Aug 23 2021 Mark Hooper 2.0.0-5 +- updated images used in 45drives-system page * Fri Aug 20 2021 Mark Hooper 2.0.0-4 - build 3, added require el7 folder * Fri Aug 20 2021 Mark Hooper 2.0.0-3 diff --git a/packaging/focal/changelog b/packaging/focal/changelog index 3973a6a..8e2dc1c 100644 --- a/packaging/focal/changelog +++ b/packaging/focal/changelog @@ -1,3 +1,9 @@ +cockpit-45drives-hardware (2.0.0-5focal) focal; urgency=medium + + * updated images used in 45drives-system page + + -- Mark Hooper Mon, 23 Aug 2021 06:02:17 -0300 + cockpit-45drives-hardware (2.0.0-4focal) focal; urgency=medium * build 3, added require el7 folder diff --git a/src/fakeroot/usr/share/cockpit/45drives-disks/45drives-disks.css b/src/fakeroot/usr/share/cockpit/45drives-disks/45drives-disks.css index c39a692..748252f 100644 --- a/src/fakeroot/usr/share/cockpit/45drives-disks/45drives-disks.css +++ b/src/fakeroot/usr/share/cockpit/45drives-disks/45drives-disks.css @@ -1,3 +1,7 @@ +body { + overflow-y:auto !important; +} + .hardware_container { margin: 0; padding: 0; diff --git a/src/fakeroot/usr/share/cockpit/45drives-motherboard/45drives-motherboard.css b/src/fakeroot/usr/share/cockpit/45drives-motherboard/45drives-motherboard.css index bb0b352..8e227fa 100644 --- a/src/fakeroot/usr/share/cockpit/45drives-motherboard/45drives-motherboard.css +++ b/src/fakeroot/usr/share/cockpit/45drives-motherboard/45drives-motherboard.css @@ -1,3 +1,7 @@ +body { + overflow-y:auto !important; +} + .hardware_container { margin: 0; padding: 0; diff --git a/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.css b/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.css index 616bf89..454ad76 100644 --- a/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.css +++ b/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.css @@ -1,5 +1,6 @@ body { padding-bottom: 20px; + overflow-y:auto !important; } .system_container { diff --git a/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.js b/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.js index a055f9d..163f9b5 100644 --- a/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.js +++ b/src/fakeroot/usr/share/cockpit/45drives-system/45drives-system.js @@ -6,21 +6,31 @@ let ram_info = null; let network_info = null; var product_img_lut = {}; - product_img_lut[""] = ""; + product_img_lut[""] = "img/products/45dlogo.png"; product_img_lut["Storinator-H8-AV15-Enhanced"] = "img/products/storinatorAV15.jpg"; + product_img_lut["Storinator-H8-AV15-Enhanced-S"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-H8-AV15-Enhanced-AMD"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-H8-AV15-Turbo"] = "img/products/storinatorAV15.jpg"; + product_img_lut["Storinator-H8-AV15-Turbo-G"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-H8-Q30-Base"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H8-Q30-Base-B"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H8-Q30-Enhanced"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H8-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H8-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H8-Q30-Turbo"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H8-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H8-S45-Base"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-H8-S45-Base-B"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H8-S45-Enhanced"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-H8-S45-Enhanced-S"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H8-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H8-S45-Turbo"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-H8-S45-Turbo-G"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H8-XL60-Enhanced"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-H8-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-H8-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-H8-XL60-Turbo"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-H8-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-H16-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H16-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H16-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg"; @@ -28,43 +38,77 @@ var product_img_lut = {}; product_img_lut["Storinator-H32-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H32-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-AV15-Turbo"] = "img/products/storinatorAV15.jpg"; + product_img_lut["Storinator-AV15-Turbo-G"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-Q30-Turbo"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-S45-Turbo"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-S45-Turbo-G"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-XL60-Turbo"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg"; product_img_lut["Stornado-AV15-Turbo"] = "img/products/stornadoAV15.jpg"; + product_img_lut["Stornado-AV15-Turbo-G"] = "img/products/stornadoAV15.jpg"; product_img_lut["Storinator-H16-Q30-Turbo"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H16-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H16-S45-Turbo"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H16-S45-Turbo-G"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H16-XL60-Turbo"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-H16-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-H32-Q30-Turbo"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H32-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H32-S45-Turbo"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H32-S45-Turbo-G"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H32-XL60-Turbo"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-H32-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-AV15-Enhanced"] = "img/products/storinatorAV15.jpg"; + product_img_lut["Storinator-AV15-Enhanced-S"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-Q30-Enhanced"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-S45-Enhanced"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-S45-Enhanced-S"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-XL60-Enhanced"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg"; product_img_lut["Stornado-AV15-Enhanced"] = "img/products/stornadoAV15.jpg"; + product_img_lut["Stornado-AV15-Enhanced-S"] = "img/products/stornadoAV15.jpg"; product_img_lut["Storinator-AV15-Enhanced-AMD"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg"; product_img_lut["Stornado-AV15-Enhanced-AMD"] = "img/products/stornadoAV15.jpg"; product_img_lut["Storinator-H16-Q30-Enhanced"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H16-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H16-S45-Enhanced"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-H16-S45-Enhanced-S"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H16-XL60-Enhanced"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-H16-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-H32-Q30-Enhanced"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-H32-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-H32-S45-Enhanced"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-H32-S45-Enhanced-S"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-H32-XL60-Enhanced"] = "img/products/storinatorXL60.jpg"; + product_img_lut["Storinator-H32-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg"; product_img_lut["Storinator-AV15-Base"] = "img/products/storinatorAV15.jpg"; + product_img_lut["Storinator-AV15-Base-B"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-Q30-Base"] = "img/products/storinatorQ30.jpg"; + product_img_lut["Storinator-Q30-Base-B"] = "img/products/storinatorQ30.jpg"; product_img_lut["Storinator-S45-Base"] = "img/products/storinatorS45.jpg"; + product_img_lut["Storinator-S45-Base-B"] = "img/products/storinatorS45.jpg"; product_img_lut["Storinator-C8-Base"] = "img/products/storinatorC8.jpg"; + product_img_lut["Storinator-C8-Base-B"] = "img/products/storinatorC8.jpg"; product_img_lut["Storinator-C8-Enhanced"] = "img/products/storinatorC8.jpg"; + product_img_lut["Storinator-C8-Enhanced-S"] = "img/products/storinatorC8.jpg"; + product_img_lut["Storinator-C8-Enhanced-AMD"] = "img/products/storinatorC8.jpg"; product_img_lut["Storinator-C8-Enhanced-AMD"] = "img/products/storinatorC8.jpg"; product_img_lut["Storinator-C8-Turbo"] = "img/products/storinatorC8.jpg"; + product_img_lut["Storinator-C8-Turbo-G"] = "img/products/storinatorC8.jpg"; product_img_lut["Storinator-MI4-Base"] = "img/products/storinatorMI4.jpg"; + product_img_lut["Storinator-MI4-Base-B"] = "img/products/storinatorMI4.jpg"; product_img_lut["Storinator-MI4-Enhanced"] = "img/products/storinatorMI4.jpg"; + product_img_lut["Storinator-MI4-Enhanced-S"] = "img/products/storinatorMI4.jpg"; product_img_lut["Storinator-MI4-Enhanced-AMD"] = "img/products/storinatorMI4.jpg"; product_img_lut["Storinator-MI4-Turbo"] = "img/products/storinatorMI4.jpg"; + product_img_lut["Storinator-MI4-Turbo-G"] = "img/products/storinatorMI4.jpg"; + + //Placeholder for failed autodetect. product_img_lut["Storinator-AV15-Generic"] = "img/products/storinatorAV15.jpg"; product_img_lut["Storinator-Q30-Generic"] = "img/products/storinatorQ30.jpg"; @@ -90,6 +134,7 @@ function sys_manual_scan(){ sys_info = JSON.parse(data); let sys_img = document.createElement("IMG"); sys_img.src = product_img_lut[String(sys_info["System"][product_idx]["Product"][0]["ProductID"])]; + //sys_img.src = product_img_lut[String(sys_info["System"][product_idx]["Product"][0]["Chassis Size"])] document.getElementById("sys_img_div").appendChild(sys_img); document.getElementById("sys_model").innerHTML = sys_info["System"][product_idx]["Product"][0]["System Model"]; document.getElementById("sys_chassis_size").innerHTML = sys_info["System"][product_idx]["Product"][0]["Chassis Size"]; diff --git a/src/fakeroot/usr/share/cockpit/45drives-system/img/products/45dlogo.png b/src/fakeroot/usr/share/cockpit/45drives-system/img/products/45dlogo.png new file mode 100644 index 0000000..c528c4a Binary files /dev/null and b/src/fakeroot/usr/share/cockpit/45drives-system/img/products/45dlogo.png differ