working on labels

.dockerignore

@@ -6,7 +6,6 @@
 .cache
 dist
 /config
-!/modules/config
 
 # Node dependencies
 node_modules

.github/workflows/build-and-push.yml

@@ -2,10 +2,10 @@ name: Create and publish Docker image
 
 on:
   push:
-    branches: ['main']
-    tags: ['v*.*.*']
+    branches: ["main"]
+    tags: ["v*.*.*"]
   release:
-    types: ['prereleased']
+    types: ["prereleased"]
 
 env:
   REGISTRY: ghcr.io
@@ -24,7 +24,7 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -44,10 +44,11 @@ jobs:
           tags: |
             type=semver,pattern={{version}}
             type=ref,event=branch
+          annotations: |
+            org.opencontainers.image.description=A web interface for managing docker containers with an emphasis on making selfhosting easy
           labels: |
             org.opencontainers.image.title=Yacht
             org.opencontainers.image.url=https://github.com/SelfhostedPro/yacht-nuxt/pkgs/container/yacht-nuxt
-            org.opencontainers.image.description=A web interface for managing docker containers with an emphasis on making selfhosting easy
             org.opencontainers.image.documentation=https://yacht.sh/docs/
             org.opencontainers.image.licenses=MIT
             org.opencontainers.image.base.name=ghcr.io/selfhostedpro/yacht-nuxt:main
@@ -57,7 +58,6 @@ jobs:
             sh.yacht.ports.3000=WebUI
             sh.yacht.shell=/bin/sh
 
-
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:

Dockerfile

@@ -24,6 +24,13 @@ RUN npm run build
 # Copy production dependencies and built files into the final image
 # Start fresh from the base to reduce the final image size
 FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as deploy
+LABEL org.opencontainers.image.title=Yacht
+LABEL org.opencontainers.image.url=https://github.com/SelfhostedPro/yacht-nuxt/pkgs/container/yacht-nuxt
+LABEL org.opencontainers.image.description="A web interface for managing docker containers with an emphasis on making selfhosting easy"
+LABEL org.opencontainers.image.documentation=https://yacht.sh/docs/
+LABEL org.opencontainers.image.licenses=MIT
+LABEL org.opencontainers.image.base.name=ghcr.io/selfhostedpro/yacht-nuxt:main
+LABEL org.opencontainers.image.vendor=SelfhostedPro
 
 LABEL build_version="Yacht version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="SelfhostedPro"

components/nav/Sidebar.vue

@@ -2,13 +2,16 @@
   <v-navigation-drawer v-model="navbar" v-if="!mdAndDown" height="100vh" :permanent="locked" elevation="10" floating
     :expand-on-hover="true" :rail="!locked">
     <v-img max-height="100" class="mx-2 mt-2" src="~/assets/icons/yacht/mini.svg" style="filter: brightness(5)" />
-    <v-btn icon class="my-2 mx-2" density="comfortable">
-      <v-icon icon="mdi-cog"></v-icon>
-      <v-menu open-on-hover :close-on-content-click="false" location="end center" activator="parent">
-        <v-btn class="my-2 mx-2" :icon="locked ? 'mdi-lock' : 'mdi-lock-open'" density="comfortable"
-          @click="locked = !locked" />
-      </v-menu>
-    </v-btn>
+    <v-hover>
+      <template #default="{ isHovering, props }">
+        <v-btn @click="settingsExpanded = !settingsExpanded" icon class="my-2 mx-2" density="comfortable" v-bind="props">
+          <v-icon :icon="settingsExpanded ? 'mdi-cog' : 'mdi-cog-outline'"></v-icon>
+        </v-btn>
+        <v-btn v-show="isHovering || settingsExpanded" class="my-2 mx-2" :icon="locked ? 'mdi-lock' : 'mdi-lock-open'"
+          density="comfortable" @click="locked = !locked" />
+      </template>
+    </v-hover>
+
 
     <v-divider />
     <v-list nav dense>
@@ -39,6 +42,7 @@
 
 <script setup lang="ts">
 import { useDisplay } from 'vuetify'
+const settingsExpanded = ref(false)
 const navbar = ref()
 const { mdAndDown } = useDisplay()
 defineProps(['links'])