diff options
| author | Antoine GIRARD <sapk@users.noreply.github.com> | 2018-03-12 10:59:13 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-03-12 11:59:13 +0200 |
| commit | 0e26db8bcd57a2b206894ccad7d2f5737a843eda (patch) | |
| tree | c703f69be93155bd615865b3537a101286c72e03 /docker | |
| parent | b333e7129d26abb64cdd34e67e39cfe34fdf5bb1 (diff) | |
| download | gitea-0e26db8bcd57a2b206894ccad7d2f5737a843eda.tar.gz gitea-0e26db8bcd57a2b206894ccad7d2f5737a843eda.zip | |
Docker multi-stage (#2927)
* Setup docker multi-stage and little sugar at it
* Make codacy happy ?
* Revert back to what the official docker documentation suggest
Codacy don't seems to follow https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
* Update golang version
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/Makefile b/docker/Makefile index a816a2e44f..7f55251860 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -7,5 +7,9 @@ DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG) .PHONY: docker docker: - 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 docker build --disable-content-trust=false -t $(DOCKER_REF) . +# support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite" . + +.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)" webhippie/golang:edge make clean generate build |