Skip to content

Commit de9911b

Browse files
committed
Split makefile for docker
1 parent 1bb7f50 commit de9911b

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

Makefile

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ SOURCES ?= $(shell find . -name "*.go" -type f)
2828

2929
TAGS ?=
3030

31-
DOCKER_IMAGE ?= gitea/gitea
32-
DOCKER_TAG ?= latest
33-
DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG)
34-
3531
TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp')
3632

3733
TEST_MYSQL_HOST ?= mysql:3306
@@ -59,6 +55,8 @@ else
5955
endif
6056
endif
6157

58+
include docker/Makefile
59+
6260
.PHONY: all
6361
all: build
6462

@@ -232,21 +230,6 @@ build: $(EXECUTABLE)
232230
$(EXECUTABLE): $(SOURCES)
233231
$(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
234232

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-
250233
.PHONY: release
251234
release: release-dirs release-windows release-linux release-darwin release-copy release-check
252235

docker/Makefile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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)

0 commit comments

Comments
 (0)