Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docker multi-arch base #1985

Merged
merged 10 commits into from
Nov 16, 2017
Merged

Docker multi-arch base #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff6d4e3
Create docker/manifest/base.yml
sapk Jun 16, 2017
f81462f
Add make task docker-multi-arch-push-manifest
sapk Jun 16, 2017
1d4f2a5
Use SED_INPLACE generic sed command
sapk Jun 16, 2017
9fcff86
Delete Dockerfile.aarch64
sapk Jun 16, 2017
6b3cfd4
Use gitea/gitea-base as base
sapk Jun 16, 2017
570acab
Fix rebase
sapk Sep 3, 2017
1bb7f50
Use sapk/gitea-base as base
sapk Sep 3, 2017
de9911b
Split makefile for docker
sapk Sep 3, 2017
ce906b2
Fix version to v3.6
sapk Sep 12, 2017
1f5c252
Remove sapk/gitea-base and use directly new official alpine multi-arch
sapk Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM alpine:3.6

LABEL maintainer="The Gitea Authors"

EXPOSE 22 3000
Expand Down
43 changes: 0 additions & 43 deletions Dockerfile.aarch64
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions Dockerfile.rpi
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -56,6 +55,8 @@ else
endif
endif

include docker/Makefile

.PHONY: all
all: build

Expand Down Expand Up @@ -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

Expand Down
11 changes: 11 additions & 0 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#Makefile related to docker

DOCKER_IMAGE ?= gitea/gitea
DOCKER_TAG ?= latest
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 -t $(DOCKER_REF) .