Skip to content

Commit 478a2d1

Browse files
committed
Merge branch 'main' into chore/add-air
2 parents efd0b77 + a6a34c1 commit 478a2d1

File tree

5 files changed

+35
-20
lines changed

5 files changed

+35
-20
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
1717
RUN pnpm css && pnpm js
1818

1919
# Go Builder
20-
FROM --platform=$BUILDPLATFORM golang:1.24.5-alpine AS build
20+
FROM --platform=$BUILDPLATFORM golang:1.24.6-alpine AS build
2121

2222
ARG VERSION=demo
2323
ARG TARGETOS

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"postcss": "^8.5.6",
2828
"postcss-cli": "^11.0.1",
2929
"postcss-nested": "^7.0.2",
30-
"typescript": "^5.8.3"
30+
"typescript": "^5.9.2"
3131
},
3232
"browserslist": [
3333
"> 0.2%",

frontend/pnpm-lock.yaml

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/damongolding/immich-kiosk
22

3-
go 1.24.5
3+
go 1.24.6
44

55
require (
66
github.com/EdlinOrg/prominentcolor v1.0.0

taskfile.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,21 @@ tasks:
6767
- go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5
6868
- go mod tidy
6969

70+
update-go:
71+
desc: Sync local Go version with go.mod and Dockerfile
72+
cmds:
73+
- |
74+
GO_VERSION_FULL=$(go version | awk '{print $3}' | sed 's/go//')
75+
echo "📦 Updating go.mod to use Go $GO_VERSION_FULL"
76+
go mod edit -go=$GO_VERSION_FULL
77+
78+
echo "🛠️ Updating Dockerfile to use Go $GO_VERSION_FULL"
79+
sed -i.bak -E "s|golang:[0-9]+\.[0-9]+(\.[0-9]+)?-[[:alnum:]-]+|golang:${GO_VERSION_FULL}-alpine|g" Dockerfile
80+
81+
echo "--- Dockerfile diff ---"
82+
diff Dockerfile.bak Dockerfile || true
83+
rm Dockerfile.bak
84+
7085
outdated-go:
7186
desc: Check for outdated Go dependencies
7287
cmds:

0 commit comments

Comments
 (0)