diff options
| author | techknowlogick <techknowlogick@gitea.io> | 2020-07-21 16:41:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 16:41:03 -0400 |
| commit | 366ca88eead635624644e3b494ce6f264537f169 (patch) | |
| tree | b43a2720be5294f36c6dcc9d7d02b52c76a89ea7 | |
| parent | d489def5edb655bab1cd1afcc1d6426e15eb963d (diff) | |
| download | gitea-366ca88eead635624644e3b494ce6f264537f169.tar.gz gitea-366ca88eead635624644e3b494ce6f264537f169.zip | |
merge docker makefile into main one (#12289)
* merge docker makefile into main one
* add readme for docker folder
* don't include a file that doesn't exist anymore
Co-authored-by: Lauris BH <lauris@nix.lv>
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | docker/Makefile | 14 | ||||
| -rw-r--r-- | docker/README.md | 7 |
3 files changed, 20 insertions, 16 deletions
@@ -30,6 +30,10 @@ XGO_VERSION := go-1.14.x MIN_GO_VERSION := 001012000 MIN_NODE_VERSION := 010013000 +DOCKER_IMAGE ?= gitea/gitea +DOCKER_TAG ?= latest +DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG) + ifeq ($(HAS_GO), GO) GOPATH ?= $(shell $(GO) env GOPATH) export PATH := $(GOPATH)/bin:$(PATH) @@ -144,8 +148,6 @@ TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1 .PHONY: all all: build -include docker/Makefile - .PHONY: help help: @echo "Make Routines:" @@ -686,5 +688,14 @@ golangci-lint: fi golangci-lint run --timeout 5m +.PHONY: docker +docker: + 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 sqlite_unlock_notify" . + +.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)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build + # This endif closes the if at the top of the file endif diff --git a/docker/Makefile b/docker/Makefile deleted file mode 100644 index bd4cb176bd..0000000000 --- a/docker/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -#Makefile related to docker - -DOCKER_IMAGE ?= gitea/gitea -DOCKER_TAG ?= latest -DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG) - -.PHONY: docker -docker: - 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 sqlite_unlock_notify" . - -.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)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000000..a698510e5e --- /dev/null +++ b/docker/README.md @@ -0,0 +1,7 @@ +# Gitea - Docker + +Dockefile is found in root of repository. + +Docker image can be found on [docker hub](https://hub.docker.com/r/gitea/gitea) + +Documentation on using docker image can be found on [Gitea Docs site](https://docs.gitea.io/en-us/install-with-docker/)
\ No newline at end of file |