work in progress

.circleci/config.yml

@@ -79,10 +79,10 @@ jobs:
           at: ./
       - run:
           name: Compile production backend
-          command: dev-scripts/build-backend
+          command: PS_VERSION="${CIRCLE_TAG-''}" dev-scripts/build-backend
       - run:
           name: Compile dev backend
-          command: dev-scripts/build-backend dev
+          command: PS_VERSION="${CIRCLE_TAG-''}" dev-scripts/build-backend dev
       - persist_to_workspace:
           root: ./
           paths:
@@ -129,10 +129,10 @@ jobs:
             docker buildx build \
               --platform "${BUILD_TARGETS}" \
               --target=artifact \
-              --output "type=local,dest=$(pwd)/build/" \
+              --output "type=local,dest=$(pwd)/bin/" \
               .
       - store_artifacts:
-          path: build
+          path: bin
       - run:
           name: Install compress utility for gzip compression
           command: |

.dockerignore

@@ -2,7 +2,6 @@
 .vscode/
 data/
 bin/
-build/
 dist/
 .coverage*
 *.env

Dockerfile

@@ -1,7 +1,9 @@
 FROM golang:1.21.1 AS builder
 
 ARG TARGETPLATFORM
+ARG PS_VERSION
 
+COPY ./build /app/build
 COPY ./cmd /app/cmd
 COPY ./dev-scripts /app/dev-scripts
 COPY ./garbagecollect /app/garbagecollect
@@ -14,7 +16,9 @@ COPY ./go.* /app/
 
 WORKDIR /app
 
-RUN TARGETPLATFORM="${TARGETPLATFORM}" ./dev-scripts/build-backend "prod"
+RUN TARGETPLATFORM="${TARGETPLATFORM}" \
+    PS_VERSION="${PS_VERSION}" \
+    ./dev-scripts/build-backend "prod"
 
 FROM scratch as artifact
 COPY --from=builder /app/bin/picoshare ./

dev-scripts/build-backend

@@ -60,8 +60,6 @@ readonly BUILD_TAGS_JOINED
 # cgo is required for mattn/go-sqlite3.
 export CGO_ENABLED=1
 
-PS_VERSION="$(git describe --tags)"
-
 go build \
   -tags "${BUILD_TAGS_JOINED}" \
   -ldflags "-w -extldflags '-static' -X 'github.com/mtlynch/picoshare/v2/build.Version=${PS_VERSION}' -X 'github.com/mtlynch/picoshare/v2/build.unixTime=$(date +%s)'" \

dev-scripts/package-binaries

@@ -21,7 +21,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 readonly SCRIPT_DIR
 cd "${SCRIPT_DIR}/.."
 
-cd build
+cd bin
 
 readonly OUTPUT_DIR="${PWD}/../dist"
 mkdir -p "${OUTPUT_DIR}"

dev-scripts/run-e2e-tests

@@ -22,7 +22,7 @@ readonly SCRIPT_DIR
 cd "${SCRIPT_DIR}/.."
 
 if [[ "${REBUILD}" == "true" ]]; then
-  ./dev-scripts/build-backend dev
+  PS_VERSION="$(git describe --tags)" ./dev-scripts/build-backend dev
 fi
 
 cd e2e

handlers/templates/pages/disk-usage.html

@@ -22,8 +22,9 @@
 {{ end }}
 
 {{ define "content" }}
-  <h1 class="title">Disk Usage</h1>
+  <h1 class="title">System Information</h1>
 
+  <h2>Disk Usage</h2>
   <progress
     class="progress is-primary"
     max="{{ .TotalBytes }}"
@@ -57,9 +58,9 @@ <h1 class="title">Disk Usage</h1>
   </div>
 
   <h2>Build info</h2>
+  <p>Version: {{ .Version }}</p>
 
   <p>Build time: {{ .BuildTime }}</p>
-  <p>Version: {{ .Version }}</p>
 {{ end }}
 
 {{ template "base.html" }}

handlers/templates/partials/navbar.html

@@ -34,12 +34,12 @@
             <div class="navbar-item has-dropdown is-hoverable">
               <a class="navbar-link" role="menuitem">System</a>
               <div class="navbar-dropdown">
+                <a class="navbar-item" role="menuitem" href="/disk-usage"
+                  >Information</a
+                >
                 <a class="navbar-item" role="menuitem" href="/settings"
                   >Settings</a
                 >
-                <a class="navbar-item" role="menuitem" href="/disk-usage"
-                  >Disk Usage</a
-                >
                 <a id="navbar-log-out" class="navbar-item" role="menuitem"
                   >Log Out</a
                 >

modd.conf

@@ -1,3 +1,3 @@
 **/*.go !**/*_test.go **/*.html **/*.js **/*.css {
-    daemon: dev-scripts/build-backend dev && PS_SHARED_SECRET=somepassword ./bin/picoshare-dev -db data/store.db
+    daemon: PS_VERSION="$(git describe --tags)" dev-scripts/build-backend dev && PS_SHARED_SECRET=somepassword ./bin/picoshare-dev -db data/store.db
 }