Skip to content

Commit 09da0ea

Browse files
committed
Add docker-multi-update-all and use GITEA_VERSION
1 parent 8596126 commit 09da0ea

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,24 @@ docker-multi-setenv:
136136
docker-multi-build: docker-multi-setenv
137137
docker pull $(DOCKER_BASE)
138138
docker tag $(DOCKER_BASE) gitea/base
139-
docker build --no-cache --build-arg TAGS="$(TAGS)" -t gitea/gitea:$(DOCKER_TAG) -f Dockerfile.multi .
139+
docker build --no-cache --build-arg TAGS="$(TAGS)" --build-arg GITEA_VERSION="$(GITEA_VERSION)" -t gitea/gitea:$(DOCKER_TAG) -f Dockerfile.multi .
140140

141141
.PHONY: docker-multi-amd64
142+
docker-multi-amd64: GITEA_VERSION ?= "master"
142143
docker-multi-amd64: DOCKER_BASE=alpine:latest
143-
docker-multi-amd64: DOCKER_TAG=linux-amd64-latest
144+
docker-multi-amd64: DOCKER_TAG=linux-amd64-$(GITEA_VERSION)
144145
docker-multi-amd64: docker-multi-build
145146

146147
.PHONY: docker-multi-arm
148+
docker-multi-arm: GITEA_VERSION ?= "master"
147149
docker-multi-arm: DOCKER_BASE=multiarch/alpine:armhf-latest-stable
148-
docker-multi-arm: DOCKER_TAG=linux-arm-latest
150+
docker-multi-arm: DOCKER_TAG=linux-arm-$(GITEA_VERSION)
149151
docker-multi-arm: docker-multi-build
150152

151153
.PHONY: docker-multi-arm64
154+
docker-multi-arm64: GITEA_VERSION ?= "master"
152155
docker-multi-arm64: DOCKER_BASE=multiarch/alpine:aarch64-latest-stable
153-
docker-multi-arm64: DOCKER_TAG=linux-arm64-latest
156+
docker-multi-arm64: DOCKER_TAG=linux-arm64-$(GITEA_VERSION)
154157
docker-multi-arm64: docker-multi-build
155158

156159
.PHONY: docker-multi-push
@@ -167,6 +170,12 @@ docker-multi-update-manifest:
167170
fi
168171
@manifest-tool --username $(DOCKER_USERNAME) --password $(DOCKER_PASSWORD) push from-spec $(DOCKER_MANIFEST)
169172

173+
.PHONY: docker-multi-update-all
174+
docker-multi-update-all: DOCKER_MANIFEST=docker/manifest/base.yml docker-multi-update-manifest
175+
docker-multi-update-all: docker-multi-amd64 docker-multi-arm docker-multi-arm64
176+
docker-multi-update-all:
177+
for DOCKER_MANIFEST in $(shell docker/manifest/gitea* ); do docker-multi-update-manifest; done;
178+
170179
.PHONY: docker
171180
docker:
172181
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/manifest/gitea.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
image: gitea/gitea:latest
22
manifests:
3-
- image: gitea/gitea:linux-amd64-latest
3+
- image: gitea/gitea:linux-amd64-master
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: gitea/gitea:linux-arm-latest
7+
- image: gitea/gitea:linux-arm-master
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: gitea/gitea:linux-arm64-latest
11+
- image: gitea/gitea:linux-arm64-master
1212
platform:
1313
architecture: arm64
1414
os: linux

0 commit comments

Comments
 (0)