* 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>tags/v1.13.0-rc1
@@ -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 |
@@ -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 |
@@ -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/) |