fix: correct dependencies and add Dockerfile
- Mark direct dependencies properly in go.mod (fsnotify, fpdf, goldmark) - Remove duplicate Theme assignment in type_webserver.go - Add Dockerfile for multi-stage build (was missing from repo) - Update PLAN.md with completed tasks Co-Authored-By: Claude (glm-5) <noreply@anthropic.com>
This commit is contained in:
40
Dockerfile
Normal file
40
Dockerfile
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
# Build stage
|
||||||
|
FROM golang:1.22-alpine AS builder
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy go.mod and go.sum first for caching
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
|
||||||
|
# Copy source code
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Build the binary with static linking
|
||||||
|
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static" -X main.APP_VERSION=${APP_VERSION:-latest} -X main.COMMIT_ID=${COMMIT_ID:-undefined}' -o gocv .
|
||||||
|
|
||||||
|
# Runtime stage
|
||||||
|
FROM alpine:latest
|
||||||
|
|
||||||
|
RUN apk --no-cache add ca-certificates tzdata
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy the binary from builder
|
||||||
|
COPY --from=builder /app/gocv .
|
||||||
|
|
||||||
|
# Copy config file
|
||||||
|
COPY config.yaml .
|
||||||
|
|
||||||
|
# Create directories for content and output
|
||||||
|
RUN mkdir -p /app/content /app/output /app/themes
|
||||||
|
|
||||||
|
# Copy themes
|
||||||
|
COPY --from=builder /app/themes ./themes
|
||||||
|
|
||||||
|
# Expose default port
|
||||||
|
EXPOSE 80
|
||||||
|
|
||||||
|
# Default command runs serve mode
|
||||||
|
ENTRYPOINT ["./gocv"]
|
||||||
|
CMD ["serve"]
|
||||||
3
PLAN.md
3
PLAN.md
@@ -15,7 +15,8 @@
|
|||||||
- [x] CLI Mode (`gocv`) generates static files to `./output` and exits.
|
- [x] CLI Mode (`gocv`) generates static files to `./output` and exits.
|
||||||
- [x] Serve Mode (`gocv serve`) hosts HTML and serves PDF on demand.
|
- [x] Serve Mode (`gocv serve`) hosts HTML and serves PDF on demand.
|
||||||
- [x] File Watcher implemented for live reload in Serve Mode (using fsnotify).
|
- [x] File Watcher implemented for live reload in Serve Mode (using fsnotify).
|
||||||
- [x] Dockerfile created for multi-stage build.
|
- [x] Dockerfile created for multi-stage build (re-created: was missing from repo).
|
||||||
|
- [x] go.mod dependencies corrected (marked direct deps properly).
|
||||||
|
|
||||||
## Active Task
|
## Active Task
|
||||||
- [x] Analyze existing backbone code and integrate Markdown parsing.
|
- [x] Analyze existing backbone code and integrate Markdown parsing.
|
||||||
|
|||||||
10
go.mod
10
go.mod
@@ -3,13 +3,11 @@ module git.bjphoster.com/source/go-cv
|
|||||||
go 1.22.2
|
go 1.22.2
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/fsnotify/fsnotify v1.9.0
|
||||||
|
github.com/go-pdf/fpdf v0.9.0
|
||||||
github.com/gorilla/mux v1.8.1
|
github.com/gorilla/mux v1.8.1
|
||||||
|
github.com/yuin/goldmark v1.7.16
|
||||||
gopkg.in/yaml.v2 v2.4.0
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require golang.org/x/sys v0.13.0 // indirect
|
||||||
github.com/fsnotify/fsnotify v1.9.0 // indirect
|
|
||||||
github.com/go-pdf/fpdf v0.9.0 // indirect
|
|
||||||
github.com/yuin/goldmark v1.7.16 // indirect
|
|
||||||
golang.org/x/sys v0.13.0 // indirect
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ func (s *WebServer) Initialize() {
|
|||||||
}
|
}
|
||||||
s.AppName = "Go Template Container Web Server"
|
s.AppName = "Go Template Container Web Server"
|
||||||
s.Theme = "default"
|
s.Theme = "default"
|
||||||
s.Theme = "default"
|
|
||||||
|
|
||||||
// Attempt to read the config file (try both config.yml and config.yaml)
|
// Attempt to read the config file (try both config.yml and config.yaml)
|
||||||
var configFile []byte
|
var configFile []byte
|
||||||
|
|||||||
Reference in New Issue
Block a user