From 594db7fb433a386603c09676542bb0ec2e700935 Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Sat, 6 Jun 2020 23:42:32 +0200 Subject: [PATCH] Fix missing CGO_EXTRA_FLAGS build arg for docker (#11782) Co-authored-by: zeripath --- Dockerfile | 1 + docker/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d029efed4..a04324c94 100644 --- 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 7824847e5..bd4cb176b 100644 --- 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