build fixes

cisagov · Sep 20, 2022 · 8cd74d7 · 8cd74d7
1 parent 87d8b0d
commit 8cd74d7
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 6 deletions.
diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml
@@ -56,6 +56,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfiles/api.Dockerfile
+          file: ./Dockerfiles/postgresql.Dockerfile
           push: true
-          tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/api:${{ steps.extract_branch.outputs.branch }}
+          tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/postgresql:${{ steps.extract_branch.outputs.branch }}
diff --git a/.github/workflows/redis-build-and-push-ghcr.yml b/.github/workflows/redis-build-and-push-ghcr.yml
@@ -56,6 +56,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfiles/api.Dockerfile
+          file: ./Dockerfiles/redis.Dockerfile
           push: true
-          tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/api:${{ steps.extract_branch.outputs.branch }}
+          tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/redis:${{ steps.extract_branch.outputs.branch }}
diff --git a/...m-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-23/16343117599.desktop b/...m-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-23/16343117599.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Malcolm - CyberChef
-Exec=/opt/firefox/firefox https://localhost/cyberchef/
+Exec=/opt/firefox/firefox https://localhost/cyberchef.html
 Terminal=false
 X-MultipleArgs=false
 Type=Application

diff --git a/...m-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-29/16637019741.desktop b/...m-iso/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-29/16637019741.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=Malcolm - NetBox
+Exec=/opt/firefox/firefox https://localhost/assets/
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=network-workgroup
+Categories=Network;
+StartupWMClass=Firefox
+StartupNotify=true
+X-XFCE-Source=file:///usr/share/applications/malcolm-netbox.desktop
diff --git a/.../config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/.../config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -27,6 +27,7 @@
         <value type="int" value="26"/>
         <value type="int" value="27"/>
         <value type="int" value="28"/>
+        <value type="int" value="29"/>
         <value type="int" value="8"/>
         <value type="int" value="2"/>
         <value type="int" value="3"/>
@@ -99,6 +100,11 @@
         <value type="string" value="16343117417.desktop"/>
       </property>
     </property>
+    <property name="plugin-29" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16637019741.desktop"/>
+      </property>
+    </property>
     <property name="plugin-20" type="string" value="launcher">
       <property name="items" type="array">
         <value type="string" value="16343116973.desktop"/>

diff --git a/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-cyberchef.desktop b/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-cyberchef.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=Malcolm - CyberChef
-Exec=/opt/firefox/firefox https://localhost/cyberchef/
+Exec=/opt/firefox/firefox https://localhost/cyberchef.html
 Terminal=false
 X-MultipleArgs=false
 Type=Application

diff --git a/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-netbox.desktop b/malcolm-iso/config/includes.chroot/usr/share/applications/malcolm-netbox.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Malcolm - NetBox
+Exec=/opt/firefox/firefox https://localhost/assets/
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=network-workgroup.png
+Categories=Network;
+StartupWMClass=Firefox
+StartupNotify=true