aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorᴜɴᴋɴᴡᴏɴ <u@gogs.io>2020-02-18 20:19:12 +0800
committerᴜɴᴋɴᴡᴏɴ <u@gogs.io>2020-02-18 20:19:12 +0800
commitbbffd1b5b69a7c83d7aee740ebb3785ea9033002 (patch)
treea1df5d84b4af6714c11481ecfd1d35719c12fb06
parent31d17de26c3a0842adb353bd6134fe6ad6161aa6 (diff)
docker: fix Docker Hub build failure
-rw-r--r--Dockerfile2
-rw-r--r--Makefile8
2 files changed, 3 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index c3cadc43..6ca3e3a9 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 b221e5de..06e66d13 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)