Merge branch 'main' into std-http

This commit is contained in:
6543 2022-07-21 21:53:36 +02:00
commit 22ced5cb37
No known key found for this signature in database
GPG key ID: C99B82E40B027BAE
3 changed files with 27 additions and 1 deletions

View file

@ -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

15
Dockerfile Normal file
View file

@ -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"]

View file

@ -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()