diff --git a/Dockerfile b/Dockerfile index 973d93b784cc..e092b5813be4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #Build stage -FROM golang:1.18-alpine3.15 AS build-env +FROM golang:1.18-alpine3.16 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM alpine:3.15 +FROM alpine:3.16 LABEL maintainer="maintainers@gitea.io" EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 27e898c58e46..e576570e5ecb 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,5 +1,5 @@ #Build stage -FROM golang:1.18-alpine3.15 AS build-env +FROM golang:1.18-alpine3.16 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM alpine:3.15 +FROM alpine:3.16 LABEL maintainer="maintainers@gitea.io" EXPOSE 2222 3000 diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 6f5efae02e99..dd83ff0620ca 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -17,6 +17,7 @@ {{if .Owner.FullName}}{{.Owner.FullName}}{{end}} {{.Owner.Name}} {{svg "octicon-rss" 18}} + {{svg "octicon-person" 18 "mr-2"}}{{.Owner.NumFollowers}} {{.i18n.Tr "user.followers"}} ยท {{.Owner.NumFollowing}} {{.i18n.Tr "user.following"}}
{{if eq .TabName "activity"}}