Skip to content

Commit 1f5c252

Browse files
committed
Remove sapk/gitea-base and use directly new official alpine multi-arch
1 parent ce906b2 commit 1f5c252

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM sapk/gitea-base
1+
FROM alpine:3.6
22
LABEL maintainer="The Gitea Authors"
33

44
EXPOSE 22 3000

docker/Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,3 @@ DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG)
99
docker:
1010
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
1111
docker build -t $(DOCKER_REF) .
12-
13-
.PHONY: docker-multi-arch-push-manifest
14-
docker-multi-arch-push-manifest: DOCKER_MANIFEST ?= docker/manifest/base.yml
15-
docker-multi-arch-push-manifest:
16-
@hash manifest-tool > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
17-
go get -u github.com/estesp/manifest-tool; \
18-
fi
19-
$(SED_INPLACE) "s;gitea/gitea;$(DOCKER_IMAGE);g" $(DOCKER_MANIFEST)
20-
@manifest-tool push from-spec $(DOCKER_MANIFEST)
21-
$(SED_INPLACE) "s;$(DOCKER_IMAGE);gitea/gitea;g" $(DOCKER_MANIFEST)

docker/manifest/base.yml

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

0 commit comments

Comments
 (0)