summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.dockerignore7
-rw-r--r--Dockerfile21
2 files changed, 26 insertions, 2 deletions
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..78fc2ba
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+data/
+public/
+tmp/
+assets/lib/node_modules/
+assets/lib/dist/
+assets/admin/lib/node_modules/
+assets/admin/lib/dist/
diff --git a/Dockerfile b/Dockerfile
index 005b856..d63fccb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,19 @@
-FROM golang:1.24-alpine AS builder
+FROM --platform=linux/amd64 oven/bun:alpine AS js-builder
+
+WORKDIR /src/assets/lib
+COPY assets/lib/package.json assets/lib/bun.lock ./
+RUN bun install --frozen-lockfile
+COPY assets/lib/ ./
+RUN bun run build
+
+WORKDIR /src/assets/admin/lib
+COPY assets/admin/lib/package.json assets/admin/lib/bun.lock ./
+RUN bun install --frozen-lockfile
+COPY assets/admin/lib/ ./
+RUN bun run build
+
+
+FROM --platform=linux/amd64 golang:1.26-alpine AS builder
RUN apk add --no-cache \
gcc \
@@ -11,10 +26,12 @@ COPY go.mod go.sum ./
RUN go mod download
COPY . .
+COPY --from=js-builder /src/assets/lib/dist assets/lib/dist
+COPY --from=js-builder /src/assets/admin/lib/dist assets/admin/lib/dist
RUN CGO_ENABLED=1 go build -o /iblog ./cmd/iblog
-FROM alpine:3.21
+FROM --platform=linux/amd64 alpine:3.21
RUN apk add --no-cache \
vips \