From 77b5b6047c76b797fabfb4bac5928793a55493d9 Mon Sep 17 00:00:00 2001 From: Nova Kwok Date: Wed, 22 Feb 2023 15:19:27 +0800 Subject: [PATCH] Use debian as baseimage in Dockerfile (#176) * Use debian as baseimage in Dockerfile to mitigate https://github.com/webp-sh/webp_server_go/issues/175 * Fix Dockerfile path --- Dockerfile | 11 ++++------- config.go | 2 +- webp-server.go | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b619ee..f963f11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.20-alpine as builder +FROM golang:1.20 as builder ARG IMG_PATH=/opt/pics ARG EXHAUST_PATH=/opt/exhaust -RUN apk update && apk add alpine-sdk aom-dev && mkdir /build +RUN apt update && apt install libaom-dev -y && mkdir /build COPY go.mod /build RUN cd /build && go mod download @@ -12,15 +12,12 @@ RUN cd /build && sed -i "s|.\/pics|${IMG_PATH}|g" config.json \ && sed -i 's/127.0.0.1/0.0.0.0/g' config.json \ && go build -ldflags="-s -w" -o webp-server . -FROM alpine +FROM debian:bullseye-slim COPY --from=builder /build/webp-server /usr/bin/webp-server COPY --from=builder /build/config.json /etc/config.json -COPY --from=builder /usr/lib/libaom.a /usr/lib/libaom.a -COPY --from=builder /usr/lib/libaom.so /usr/lib/libaom.so -COPY --from=builder /usr/lib/libaom.so.3 /usr/lib/libaom.so.3 -COPY --from=builder /usr/lib/libaom.so.3.5.0 /usr/lib/libaom.so.3.5.0 +COPY --from=builder /usr/lib/x86_64-linux-gnu/libaom.so /usr/lib/libaom.so.0 WORKDIR /opt diff --git a/config.go b/config.go index cc593a9..83f77b9 100644 --- a/config.go +++ b/config.go @@ -22,7 +22,7 @@ var ( prefetch, proxyMode bool remoteRaw = "remote-raw" config Config - version = "0.4.9" + version = "0.5.0" releaseUrl = "https://github.com/webp-sh/webp_server_go/releases/latest/download/" ) diff --git a/webp-server.go b/webp-server.go index ddd70b8..5b41809 100644 --- a/webp-server.go +++ b/webp-server.go @@ -48,7 +48,7 @@ func deferInit() { if verboseMode { log.SetLevel(log.DebugLevel) - log.Debug("Debug mode is enable!") + log.Debug("Debug mode is enabled!") } else { log.SetLevel(log.InfoLevel) } @@ -103,7 +103,7 @@ Develop by WebP Server team. https://github.com/webp-sh`, version) } app := fiber.New(fiber.Config{ - ServerHeader: "Webp-Server-Go", + ServerHeader: "Webp Server Go", DisableStartupMessage: true, }) app.Use(logger.New()) @@ -112,7 +112,7 @@ Develop by WebP Server team. https://github.com/webp-sh`, version) app.Get("/*", convert) fmt.Printf("\n %c[1;32m%s%c[0m\n\n", 0x1B, banner, 0x1B) - fmt.Println("Webp-Server-Go is Running on http://" + listenAddress) + fmt.Println("Webp Server Go is Running on http://" + listenAddress) _ = app.Listen(listenAddress)