Fix missing CGO_EXTRA_FLAGS build arg for docker (#11782)

Co-authored-by: zeripath <art27@cantab.net>

diff --git a/Dockerfile b/Dockerfile
index d029efed49c66ee2c5c44f2ccee689f83ec1734b..a04324c94ef4cc945cde1fa125f92eeaa7cf14f1 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ ENV GOPROXY ${GOPROXY:-direct}
 ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata $TAGS"
+ARG CGO_EXTRA_CFLAGS
 
 #Build deps
 RUN apk --no-cache add build-base git nodejs npm

diff --git a/docker/Makefile b/docker/Makefile
index 7824847e5415d8b26e196a3cc7db26f59aa5b1cc..bd4cb176bdbdbdfce6d4fa57758ba7a62f4a0db5 100644 (file)
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -11,4 +11,4 @@ docker:
 
 .PHONY: docker-build
 docker-build:
-       docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" webhippie/golang:edge make clean build
+       docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build