wood/webp_server_go
1
0
Fork 0
mirror of https://github.com/woodchen-ink/webp_server_go.git synced 2025-07-18 13:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimized Dockerfile, bump version (#318)

Browse Source 
* Optimized Dockerfile, bump version

* Remove unused extraParams
This commit is contained in:
Nova Kwok 2024-02-29 20:06:15 +08:00 committed by GitHub
parent 61880e2cdf
commit ca1050d3c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@ -12,25 +12,10 @@ 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 \ && sed -i 's/127.0.0.1/0.0.0.0/g' config.json \
&& go build -ldflags="-s -w" -o webp-server . && go build -ldflags="-s -w" -o webp-server .
FROM debian:bookworm-slim as libwebp
RUN apt update && apt install -y wget gcc make autoconf automake libtool libgif-dev \
libjpeg-dev libjpeg62-turbo libjpeg62-turbo-dev libpng-dev libpng-tools libpng16-16 libtiff-dev libtiff6 libtiffxx6
RUN mkdir libwebp && mkdir -p /build/usr && mkdir /build/usr/lib/ && cd libwebp && \
wget https://chromium.googlesource.com/webm/libwebp/+archive/refs/heads/1.3.2.tar.gz && \
tar xf 1.3.2.tar.gz && rm -f 1.3.2.tar.gz && \
./autogen.sh && \
./configure --prefix=/build/usr --libdir=/build/usr/lib --enable-everything && \
make && make install
FROM debian:bookworm-slim FROM debian:bookworm-slim
RUN apt update && apt install --no-install-recommends libvips ca-certificates libjemalloc2 libtcmalloc-minimal4 -y && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/archives/* RUN apt update && apt install --no-install-recommends libvips ca-certificates libjemalloc2 libtcmalloc-minimal4 -y && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/archives/*
# for CVE-2023-4863
RUN dpkg --remove --force-depends libwebp-dev libwebp7 libwebpdemux2 libwebpmux3
COPY --from=libwebp /build/usr/lib/* /usr/lib/temp-linux-gnu/
RUN mv /usr/lib/temp-linux-gnu/* /usr/lib/$(uname -m)-linux-gnu/ && ldconfig
COPY --from=builder /build/webp-server /usr/bin/webp-server COPY --from=builder /build/webp-server /usr/bin/webp-server
COPY --from=builder /build/config.json /etc/config.json COPY --from=builder /build/config.json /etc/config.json

2
config/config.go
View File

@ -47,7 +47,7 @@ var (
ProxyMode bool ProxyMode bool
Prefetch bool Prefetch bool
Config = NewWebPConfig() Config = NewWebPConfig()
Version = "0.10.7" Version = "0.10.8"
WriteLock = cache.New(5*time.Minute, 10*time.Minute) WriteLock = cache.New(5*time.Minute, 10*time.Minute)
ConvertLock = cache.New(5*time.Minute, 10*time.Minute) ConvertLock = cache.New(5*time.Minute, 10*time.Minute)
RemoteRaw = "./remote-raw" RemoteRaw = "./remote-raw"

8
encoder/encoder.go
View File

@ -120,15 +120,15 @@ func convertImage(rawPath, optimizedPath, imageType string, extraParams config.E
switch imageType { switch imageType {
case "webp": case "webp":
err = webpEncoder(img, rawPath, optimizedPath, extraParams) err = webpEncoder(img, rawPath, optimizedPath)
case "avif": case "avif":
err = avifEncoder(img, rawPath, optimizedPath, extraParams) err = avifEncoder(img, rawPath, optimizedPath)
} }
return err return err
} }
func avifEncoder(img *vips.ImageRef, rawPath string, optimizedPath string, extraParams config.ExtraParams) error { func avifEncoder(img *vips.ImageRef, rawPath string, optimizedPath string) error {
var ( var (
buf []byte buf []byte
quality = config.Config.Quality quality = config.Config.Quality
@ -163,7 +163,7 @@ func avifEncoder(img *vips.ImageRef, rawPath string, optimizedPath string, extra
return nil return nil
} }
func webpEncoder(img *vips.ImageRef, rawPath string, optimizedPath string, extraParams config.ExtraParams) error { func webpEncoder(img *vips.ImageRef, rawPath string, optimizedPath string) error {
var ( var (
buf []byte buf []byte
quality = config.Config.Quality quality = config.Config.Quality

2
encoder/prefetch.go
View File

@ -18,7 +18,7 @@ func PrefetchImages() {
var sTime = time.Now() var sTime = time.Now()
log.Infof("Prefetching using %d cores", config.Jobs) log.Infof("Prefetching using %d cores", config.Jobs)
var finishChan = make(chan int, config.Jobs) var finishChan = make(chan int, config.Jobs)
for _ = range config.Jobs { for range config.Jobs {
finishChan <- 1 finishChan <- 1
} }

2
webp-server.go
View File

@ -59,7 +59,7 @@ func init() {
▘ ▘▝▀▘▀▀ ▘ ▝▀ ▝▀▘▘ ▘ ▝▀▘▘ ▝▀ ▝▀ ▘ ▘▝▀▘▀▀ ▘ ▝▀ ▝▀▘▘ ▘ ▝▀▘▘ ▝▀ ▝▀
WebP Server Go - v%s WebP Server Go - v%s
Develop by WebP Server team. https://github.com/webp-sh`, config.Version) Developed by WebP Server team. https://github.com/webp-sh`, config.Version)
// main init is the last one to be called // main init is the last one to be called
flag.Parse() flag.Parse()
// process cli params // process cli params