diff options
| author | Antoine GIRARD <sapk@users.noreply.github.com> | 2017-11-16 14:16:40 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-11-16 15:16:40 +0200 |
| commit | dac0f14f349fc1e8e66928cc670dbc25f0e1f5bb (patch) | |
| tree | 46b9d69d61e939f81a8bebab8bd74d66892fa6be /Makefile | |
| parent | 7c3e605698aded0c1a877ad9e8e43bd6b70c6f18 (diff) | |
| download | gitea-dac0f14f349fc1e8e66928cc670dbc25f0e1f5bb.tar.gz gitea-dac0f14f349fc1e8e66928cc670dbc25f0e1f5bb.zip | |
Docker multi-arch base (#1985)
* Create docker/manifest/base.yml
serve as base for build docker image for most platform (386,amd64,arm,arm64)
* Add make task docker-multi-arch-push-manifest
To update references of a multi-arch image on docker registry.
* Use SED_INPLACE generic sed command
* Delete Dockerfile.aarch64
Delete Dockerfile.rpi
* Use gitea/gitea-base as base
and replace deprecated MAINTAINER by LABEL (https://docs.docker.com/engine/reference/builder/#maintainer-deprecated)
* Fix rebase
* Use sapk/gitea-base as base
* Split makefile for docker
* Fix version to v3.6
Could use in later version edge of alpine official library that support multi-arch for armhf.
* Remove sapk/gitea-base and use directly new official alpine multi-arch
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -15,7 +15,6 @@ else endif BINDATA := modules/{options,public,templates}/bindata.go -DOCKER_TAG := gitea/gitea:latest GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go") GOFMT ?= gofmt -s @@ -56,6 +55,8 @@ else endif endif +include docker/Makefile + .PHONY: all all: build @@ -229,11 +230,6 @@ build: $(EXECUTABLE) $(EXECUTABLE): $(SOURCES) $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ -.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 -t $(DOCKER_TAG) . - .PHONY: release release: release-dirs release-windows release-linux release-darwin release-copy release-check |