File tree Expand file tree Collapse file tree 2 files changed +23
-19
lines changed Expand file tree Collapse file tree 2 files changed +23
-19
lines changed Original file line number Diff line number Diff line change @@ -28,10 +28,6 @@ SOURCES ?= $(shell find . -name "*.go" -type f)
28
28
29
29
TAGS ?=
30
30
31
- DOCKER_IMAGE ?= gitea/gitea
32
- DOCKER_TAG ?= latest
33
- DOCKER_REF := $(DOCKER_IMAGE ) :$(DOCKER_TAG )
34
-
35
31
TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp')
36
32
37
33
TEST_MYSQL_HOST ?= mysql:3306
59
55
endif
60
56
endif
61
57
58
+ include docker/Makefile
59
+
62
60
.PHONY : all
63
61
all : build
64
62
@@ -232,21 +230,6 @@ build: $(EXECUTABLE)
232
230
$(EXECUTABLE ) : $(SOURCES )
233
231
$(GO ) build $(GOFLAGS ) $(EXTRA_GOFLAGS ) -tags ' $(TAGS)' -ldflags ' -s -w $(LDFLAGS)' -o $@
234
232
235
- .PHONY : docker
236
- docker :
237
- 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) " webhippie/golang:edge make clean generate build
238
- docker build -t $(DOCKER_REF ) .
239
-
240
- .PHONY : docker-multi-arch-push-manifest
241
- docker-multi-arch-push-manifest : DOCKER_MANIFEST ?= docker/manifest/base.yml
242
- docker-multi-arch-push-manifest :
243
- @hash manifest-tool > /dev/null 2>&1 ; if [ $$ ? -ne 0 ]; then \
244
- go get -u github.com/estesp/manifest-tool; \
245
- fi
246
- $(SED_INPLACE ) " s;gitea/gitea;$( DOCKER_IMAGE) ;g" $(DOCKER_MANIFEST )
247
- @manifest-tool push from-spec $(DOCKER_MANIFEST )
248
- $(SED_INPLACE ) " s;$( DOCKER_IMAGE) ;gitea/gitea;g" $(DOCKER_MANIFEST )
249
-
250
233
.PHONY : release
251
234
release : release-dirs release-windows release-linux release-darwin release-copy release-check
252
235
Original file line number Diff line number Diff line change
1
+ # Makefile related to docker
2
+
3
+ DOCKER_IMAGE ?= gitea/gitea
4
+ DOCKER_TAG ?= latest
5
+ DOCKER_REF := $(DOCKER_IMAGE ) :$(DOCKER_TAG )
6
+
7
+
8
+ .PHONY : docker
9
+ docker :
10
+ 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) " webhippie/golang:edge make clean generate build
11
+ docker build -t $(DOCKER_REF ) .
12
+
13
+ .PHONY : docker-multi-arch-push-manifest
14
+ docker-multi-arch-push-manifest : DOCKER_MANIFEST ?= docker/manifest/base.yml
15
+ docker-multi-arch-push-manifest :
16
+ @hash manifest-tool > /dev/null 2>&1 ; if [ $$ ? -ne 0 ]; then \
17
+ go get -u github.com/estesp/manifest-tool; \
18
+ fi
19
+ $(SED_INPLACE ) " s;gitea/gitea;$( DOCKER_IMAGE) ;g" $(DOCKER_MANIFEST )
20
+ @manifest-tool push from-spec $(DOCKER_MANIFEST )
21
+ $(SED_INPLACE ) " s;$( DOCKER_IMAGE) ;gitea/gitea;g" $(DOCKER_MANIFEST )
You can’t perform that action at this time.
0 commit comments