From 0fc34c0d33c920f78ff642d706c6f6e5c6200c23 Mon Sep 17 00:00:00 2001 From: Benny Date: Thu, 11 Aug 2022 19:51:40 +0800 Subject: [PATCH] golang 1.19.0 (#140) * golang 1.19.0 * Upgrade golang.org/x/crypto Co-authored-by: n0vad3v --- Dockerfile | 7 +++---- go.mod | 1 + go.sum | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27671f5..028fae4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.4-alpine as builder +FROM golang:1.19.0-alpine as builder ARG IMG_PATH=/opt/pics ARG EXHAUST_PATH=/opt/exhaust @@ -10,7 +10,7 @@ COPY . /build RUN cd /build && sed -i "s|.\/pics|${IMG_PATH}|g" config.json \ && sed -i "s|\"\"|\"${EXHAUST_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 . + && go build -ldflags="-s -w" -buildvcs=false -o webp-server . @@ -22,8 +22,7 @@ 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 /usr/lib/libaom.so.3 -COPY --from=builder /usr/lib/libaom.so.3.2.0 /usr/lib/libaom.so.3.2.0 +COPY --from=builder /usr/lib/libaom.so.3.3.0 /usr/lib/libaom.so.3.3.0 WORKDIR /opt diff --git a/go.mod b/go.mod index e87cc21..76fc35e 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/staktrace/go-update v0.0.0-20210525161054-fc019945f9a2 github.com/stretchr/testify v1.8.0 github.com/valyala/fasthttp v1.38.0 + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect golang.org/x/image v0.0.0-20200119044424-58c23975cae1 ) diff --git a/go.sum b/go.sum index b396745..6b67122 100644 --- a/go.sum +++ b/go.sum @@ -51,6 +51,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg= golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=