From bbffd1b5b69a7c83d7aee740ebb3785ea9033002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=9C=C9=B4=E1=B4=8B=C9=B4=E1=B4=A1=E1=B4=8F=C9=B4?= Date: Tue, 18 Feb 2020 20:19:12 +0800 Subject: [PATCH] docker: fix Docker Hub build failure --- Dockerfile | 2 +- Makefile | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3cadc43a..6ca3e3a99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apk --no-cache --no-progress add --virtual \ WORKDIR /go/src/github.com/gogs/gogs COPY . . -RUN make build TAGS="sqlite cert pam" +RUN make build-no-gen TAGS="sqlite cert pam" FROM alpine:3.10 ADD https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 /usr/sbin/gosu diff --git a/Makefile b/Makefile index b221e5ded..06e66d13c 100644 --- a/Makefile +++ b/Makefile @@ -38,12 +38,8 @@ govet: build: $(GENERATED) go build $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)' -trimpath -o gogs -build-dev: $(GENERATED) govet - go build $(BUILD_FLAGS) -tags '$(TAGS)' -trimpath -o gogs - cp '$(GOPATH)/bin/gogs' . - -build-dev-race: $(GENERATED) govet - go build $(BUILD_FLAGS) -race -tags '$(TAGS)' -trimpath -o gogs +build-no-gen: + go build $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)' -trimpath -o gogs pack: rm -rf $(RELEASE_GOGS)