From 8207586a4818b011649dbae8ca646196a3d74b21 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 15 Jul 2022 21:39:42 +0200 Subject: [PATCH 1/2] just fix bcaceda71177d701f91c01eb04213e126de71ea0 --- server/upstream/upstream.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/upstream/upstream.go b/server/upstream/upstream.go index 5e888ac..9b7464e 100644 --- a/server/upstream/upstream.go +++ b/server/upstream/upstream.go @@ -199,7 +199,7 @@ func (o *Options) Upstream(ctx *fasthttp.RequestCtx, giteaClient *gitea.Client, } log.Debug().Msg("response") - if res != nil && res.Header.ContentLength() > fileCacheSizeLimit && ctx.Err() == nil { + if res != nil && res.Header.ContentLength() <= fileCacheSizeLimit && ctx.Err() == nil { cachedResponse.Exists = true cachedResponse.MimeType = mimeType cachedResponse.Body = cacheBodyWriter.Bytes() From 00e8a41c89486e8db3f49cbae7856471e9282f5a Mon Sep 17 00:00:00 2001 From: dorianim Date: Sat, 16 Jul 2022 00:59:55 +0200 Subject: [PATCH 2/2] Add Dockerfile (#111) Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/111 Reviewed-by: 6543 <6543@noreply.codeberg.org> Co-authored-by: dorianim Co-committed-by: dorianim --- .woodpecker.yml | 11 +++++++++++ Dockerfile | 15 +++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Dockerfile diff --git a/.woodpecker.yml b/.woodpecker.yml index 081d131..b83a4dd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -26,6 +26,17 @@ pipeline: when: event: [ "pull_request", "push" ] + build-docker: + image: plugins/kaniko + settings: + dockerfile: Dockerfile + no_push: true + repo: Codeberg/pages-server + tags: latest + when: + event: [ "pull_request", "push" ] + path: Dockerfile + build-tag: group: compliant image: a6543/golang_just diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..71dd236 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM golang:alpine as build + +WORKDIR /workspace + +RUN apk add ca-certificates +COPY . . +RUN CGO_ENABLED=0 go build . + +FROM scratch +COPY --from=build /workspace/pages /pages +COPY --from=build \ + /etc/ssl/certs/ca-certificates.crt \ + /etc/ssl/certs/ca-certificates.crt + +ENTRYPOINT ["/pages"] \ No newline at end of file