fixes short sha

.github/workflows/deploy.yml

@@ -127,7 +127,9 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
-          build-args: TAG=${{ steps.meta.outputs.version }}
+          build-args: |
+            TAG=${{ steps.meta.outputs.version }}
+            SHA=${{ github.sha.substr(0,9) }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/dev.yml

@@ -45,7 +45,9 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
-          build-args: TAG=${{ steps.meta.outputs.version }}
+          build-args: |
+            TAG=${{ steps.meta.outputs.version }}
+            SHA=${{ github.sha.substr(0,9) }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

Dockerfile

@@ -48,13 +48,14 @@ COPY --from=node /build/dist ./dist
 
 # Args
 ARG TAG=dev
+ARG SHA=
 ARG TARGETOS TARGETARCH
 
 # Generate protos
 RUN go generate
 
 # Build binary
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=$TAG" -o dozzle
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=$TAG -X github.com/amir20/dozzle/internal/support/cli.SHA=$SHA" -o dozzle
 
 RUN mkdir /data
 

Makefile

@@ -2,7 +2,7 @@ PROTO_DIR := protos
 GEN_DIR := internal/agent/pb
 PROTO_FILES := $(wildcard $(PROTO_DIR)/*.proto)
 GEN_FILES := $(patsubst $(PROTO_DIR)/%.proto,$(GEN_DIR)/%.pb.go,$(PROTO_FILES))
-
+SHA := $(shell git rev-parse --short HEAD)
 .PHONY: clean
 clean:
 	@rm -rf dist
@@ -26,11 +26,12 @@ test: fake_assets generate
 
 .PHONY: build
 build: dist generate
-	CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=local"
+	echo "Building with SHA: $(SHA)"
+	CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=local -X github.com/amir20/dozzle/internal/support/cli.SHA=$(SHA)"
 
 .PHONY: docker
 docker: shared_key.pem shared_cert.pem
-	@docker build  --build-arg TAG=local -t amir20/dozzle .
+	@docker build  --build-arg TAG=local --build-arg SHA=$(SHA) -t amir20/dozzle .
 
 generate: shared_key.pem shared_cert.pem $(GEN_FILES)
 

assets/components/FuzzySearchModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="dropdown dropdown-open w-full">
+  <div class="dropdown dropdown-open w-full shadow-md">
     <div class="input input-xl input-primary flex w-full items-center">
       <mdi:magnify class="flex size-8" />
       <input

assets/components/LogViewer/LogAnalytics.vue

@@ -11,11 +11,11 @@
           <textarea
             v-model="query"
             class="textarea textarea-primary w-full font-mono text-lg"
-            :class="{ 'textarea-error': error }"
-            :disabled="state !== 'ready'"
+            :class="{ 'textarea-error!': error }"
+            :disabled="state === 'downloading'"
           ></textarea>
           <div class="mt-2">
-            <span class="text-error" v-if="state === 'error'">{{ error }}</span>
+            <span class="text-error" v-if="error">{{ error }}</span>
             <span v-else-if="state === 'initializing'">{{ $t("analytics.creating_table") }}</span>
             <span v-else-if="state === 'downloading'">{{
               $t("analytics.downloading", { size: formatBytes(bytes, { decimals: 1 }) })
@@ -45,7 +45,7 @@ const error = ref<string | null>(null);
 const debouncedQuery = debouncedRef(query, 500);
 const evaluating = ref(false);
 const pageLimit = 1000;
-const state = ref<"downloading" | "error" | "ready" | "initializing">("downloading");
+const state = ref<"downloading" | "ready" | "initializing">("downloading");
 const bytes = ref(0);
 
 const url = withBase(
@@ -96,7 +96,6 @@ onMounted(async () => {
     state.value = "ready";
   } catch (e) {
     console.error(e);
-    state.value = "error";
     if (e instanceof Error) {
       error.value = e.message;
     }
@@ -115,7 +114,6 @@ const results = computedAsync(
   {
     onError: (e) => {
       console.error(e);
-      state.value = "error";
       if (e instanceof Error) {
         error.value = e.message;
       }

assets/components/common/ToastModal.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="toast toast-end whitespace-normal max-md:m-0 max-md:w-full">
+  <div class="toast toast-end whitespace-normal max-md:end-auto max-md:m-0 max-md:max-w-full">
     <div
-      class="alert max-w-xl max-md:rounded-none"
+      class="alert max-w-xl shadow-sm max-md:rounded-none"
       v-for="{ toast, options: { timed } } in toasts"
       :key="toast.id"
       :class="{

assets/layouts/default.vue

@@ -25,7 +25,7 @@
       </Pane>
     </Splitpanes>
     <label
-      class="btn btn-circle swap bg-base-content/10 swap-rotate border-base-content/20 hover:border-primary fixed bottom-4 -left-12 w-16 transition-all hover:-left-4"
+      class="btn btn-circle swap bg-base-content/10 swap-rotate border-base-content/20 hover:border-primary fixed bottom-4 -left-12 w-16 shadow-sm transition-all hover:-left-4"
       :class="{ '-left-6!': collapseNav }"
       v-if="!isMobile && !forceMenuHidden"
     >
@@ -34,7 +34,7 @@
       <mdi:chevron-left class="swap-off" />
     </label>
   </div>
-  <dialog ref="modal" class="modal items-start bg-white/15 backdrop-blur-xs transition-none!" @close="open = false">
+  <dialog ref="modal" class="modal bg-base-300/50! items-start backdrop-blur-md transition-none!" @close="open = false">
     <div class="modal-box max-w-2xl bg-transparent pt-20 shadow-none">
       <FuzzySearchModal @close="open = false" v-if="open" />
     </div>

internal/support/cli/args.go

@@ -9,6 +9,7 @@ import (
 )
 
 var Version = "head"
+var SHA = ""
 
 type Args struct {
 	Addr             string              `arg:"env:DOZZLE_ADDR" default:":8080" help:"sets host:port to bind for server. This is rarely needed inside a docker container."`

internal/web/version.go

@@ -3,9 +3,11 @@ package web
 import (
 	"fmt"
 	"net/http"
+
+	"github.com/amir20/dozzle/internal/support/cli"
 )
 
 func (h *handler) version(w http.ResponseWriter, r *http.Request) {
 	w.Header().Add("Content-Type", "text/html")
-	fmt.Fprintf(w, "<pre>%v</pre>", h.config.Version)
+	fmt.Fprintf(w, "<pre>%v  commit: %v</pre>", h.config.Version, cli.SHA)
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dozzle",
-  "version": "8.12.9",
+  "version": "8.12.10",
   "description": "Realtime log viewer for docker containers.",
   "homepage": "https://github.com/amir20/dozzle#readme",
   "bugs": {