Updating dockerfiles
This commit is contained in:
parent
fd3935e42e
commit
118a10b6f4
|
|
@ -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
|
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o vault cmd/vault/main.go
|
||||||
|
|
||||||
FROM alpine:latest
|
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
|
WORKDIR /app
|
||||||
COPY --from=builder /app/server .
|
COPY --from=builder /app/server .
|
||||||
COPY --from=builder /app/vault .
|
COPY --from=builder /app/vault .
|
||||||
|
|
|
||||||
|
|
@ -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
|
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server cmd/server/main.go
|
||||||
|
|
||||||
FROM alpine:latest
|
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
|
WORKDIR /app
|
||||||
COPY --from=builder /app/server .
|
COPY --from=builder /app/server .
|
||||||
COPY go/templates ./templates
|
COPY go/templates ./templates
|
||||||
|
|
|
||||||
|
|
@ -193,15 +193,19 @@ func (g *HTMLDocumentGenerator) GenerateQuotePDF(data *QuotePDFData) (string, er
|
||||||
// Generate final PDF filename using quote number
|
// Generate final PDF filename using quote number
|
||||||
quoteNumber := ""
|
quoteNumber := ""
|
||||||
if data.Document != nil {
|
if data.Document != nil {
|
||||||
|
log.Printf("=== HTML Generator: Document not nil, CmcReference='%s'", data.Document.CmcReference)
|
||||||
quoteNumber = data.Document.CmcReference
|
quoteNumber = data.Document.CmcReference
|
||||||
if data.Document.Revision > 0 {
|
if data.Document.Revision > 0 {
|
||||||
quoteNumber = fmt.Sprintf("%s_%d", quoteNumber, data.Document.Revision)
|
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",
|
log.Printf("=== HTML Generator: Quote number before fallback: '%s', Document ID: %d, Revision: %d",
|
||||||
quoteNumber, data.Document.ID, data.Document.Revision)
|
quoteNumber, data.Document.ID, data.Document.Revision)
|
||||||
filenameBase := quoteNumber
|
filenameBase := quoteNumber
|
||||||
if filenameBase == "" {
|
if filenameBase == "" {
|
||||||
|
log.Printf("=== HTML Generator: Using fallback filename")
|
||||||
filenameBase = "CMC Quote"
|
filenameBase = "CMC Quote"
|
||||||
}
|
}
|
||||||
log.Printf("=== HTML Generator: Final filename base: '%s'", filenameBase)
|
log.Printf("=== HTML Generator: Final filename base: '%s'", filenameBase)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue