Updating dockerfiles

This commit is contained in:
Finley Ghosh 2026-01-19 00:11:41 +11:00
parent fd3935e42e
commit 118a10b6f4
3 changed files with 16 additions and 2 deletions

View file

@ -12,7 +12,12 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server cmd/server
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o vault cmd/vault/main.go
FROM alpine:latest
RUN apk --no-cache add ca-certificates tzdata
RUN apk --no-cache add ca-certificates tzdata chromium nss freetype harfbuzz ttf-freefont
# Set environment variable for chromedp to find chromium
ENV CHROME_BIN=/usr/bin/chromium-browser \
CHROME_PATH=/usr/bin/chromium-browser
WORKDIR /app
COPY --from=builder /app/server .
COPY --from=builder /app/vault .

View file

@ -11,7 +11,12 @@ RUN go mod tidy
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server cmd/server/main.go
FROM alpine:latest
RUN apk --no-cache add ca-certificates tzdata
RUN apk --no-cache add ca-certificates tzdata chromium nss freetype harfbuzz ttf-freefont
# Set environment variable for chromedp to find chromium
ENV CHROME_BIN=/usr/bin/chromium-browser \
CHROME_PATH=/usr/bin/chromium-browser
WORKDIR /app
COPY --from=builder /app/server .
COPY go/templates ./templates

View file

@ -193,15 +193,19 @@ func (g *HTMLDocumentGenerator) GenerateQuotePDF(data *QuotePDFData) (string, er
// Generate final PDF filename using quote number
quoteNumber := ""
if data.Document != nil {
log.Printf("=== HTML Generator: Document not nil, CmcReference='%s'", data.Document.CmcReference)
quoteNumber = data.Document.CmcReference
if data.Document.Revision > 0 {
quoteNumber = fmt.Sprintf("%s_%d", quoteNumber, data.Document.Revision)
}
} else {
log.Printf("=== HTML Generator: Document is nil!")
}
log.Printf("=== HTML Generator: Quote number before fallback: '%s', Document ID: %d, Revision: %d",
quoteNumber, data.Document.ID, data.Document.Revision)
filenameBase := quoteNumber
if filenameBase == "" {
log.Printf("=== HTML Generator: Using fallback filename")
filenameBase = "CMC Quote"
}
log.Printf("=== HTML Generator: Final filename base: '%s'", filenameBase)