big-bro-watches-everything/devstar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing CGO_EXTRA_FLAGS build arg for docker (#11782)

repo.diff.browse_source 
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Cirno the Strongest
2020-06-06 23:42:32 +02:00
repo.diff.committed_by GitHub
repo.diff.parent 304542af31
repo.diff.commit 594db7fb43
repo.diff.stats_desc%!(EXTRA int=2, int=2, int=1)
repo.diff.download_patch repo.diff.download_diff Expand all files Collapse all files

1
Dockerfile
repo.diff.view_file

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

2
docker/Makefile repo.diff.vendored
repo.diff.view_file

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