Skip to content

Commit dac0f14

Browse files
sapklafriks
authored andcommitted
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
1 parent 7c3e605 commit dac0f14

File tree

5 files changed

+13
-91
lines changed

5 files changed

+13
-91
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM alpine:3.6
2-
32
LABEL maintainer="The Gitea Authors"
43

54
EXPOSE 22 3000

Dockerfile.aarch64

Lines changed: 0 additions & 43 deletions
This file was deleted.

Dockerfile.rpi

Lines changed: 0 additions & 41 deletions
This file was deleted.

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ else
1515
endif
1616

1717
BINDATA := modules/{options,public,templates}/bindata.go
18-
DOCKER_TAG := gitea/gitea:latest
1918
GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go")
2019
GOFMT ?= gofmt -s
2120

@@ -56,6 +55,8 @@ else
5655
endif
5756
endif
5857

58+
include docker/Makefile
59+
5960
.PHONY: all
6061
all: build
6162

@@ -229,11 +230,6 @@ build: $(EXECUTABLE)
229230
$(EXECUTABLE): $(SOURCES)
230231
$(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
231232

232-
.PHONY: docker
233-
docker:
234-
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
235-
docker build -t $(DOCKER_TAG) .
236-
237233
.PHONY: release
238234
release: release-dirs release-windows release-linux release-darwin release-copy release-check
239235

docker/Makefile

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

0 commit comments

Comments
 (0)